Changeset 19856 for trunk/Mars

Timestamp:

11/03/19 12:44:22 (5 years ago)

Author:

tbretz

Message:

Also the include of unordered_map only needs to be secured for ROOTv5 CINT.

File:

• trunk/Mars/mcore/fits.h (modified) (2 diffs)

trunk/Mars/mcore/fits.h

@@ -15 +15 @@
 
 #define GCC_VERSION (__GNUC__ * 10000  + __GNUC_MINOR__ * 100  + __GNUC_PATCHLEVEL__)
-
-#ifndef __CINT__
-#include <unordered_map>
-#else
-#define off_t size_t
-namespace std
-{
-    template<class T, class S> class unordered_map<T, S>;
-}
-#endif
 
 // ROOT_VERSION is not defined in ROOTv5, but special treatment is
@@ -34 +24 @@
 #define __ROOTv6__ 1
 #endif
+#endif
+
+#if !defined(__CINT__) || defined(__CLING__) || defined(__ROOTv6__)
+#include <unordered_map>
+#else
+#define off_t size_t
+namespace std
+{
+    template<class T, class S> class unordered_map<T, S>;
+}
 #endif