Changeset 17293

Timestamp:

10/21/13 13:39:34 (11 years ago)

Author:

tbretz

Message:

Found a better solution to allow rootcint to parse unordered_map.

File:

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

trunk/Mars/mcore/fits.h

@@ -11 +11 @@
 #include <stdexcept>
 
-#ifdef __CINT__
+#ifndef __CINT__
+#include <unordered_map>
+#else
 #define off_t size_t
-#endif
-
-#if !defined(__MARS__) && !defined(__CINT__)
-#include <unordered_map>
+namespace std
+{
+    template<class T, class S> class unordered_map<T, S>;
+}
 #endif
 
@@ -489 +491 @@
     Addresses fAddresses;
 
-#if defined(__MARS__) || defined(__CINT__)
-    typedef std::map<std::string, void*> Pointers;
-#else
     typedef std::unordered_map<std::string, void*> Pointers;
-#endif
     Pointers fPointers;
 
@@ -817 +815 @@
     }
 
-#if !defined(__MARS__) && !defined(__CINT__)
     virtual bool GetRow(size_t row, bool check=true)
-#else
-    virtual bool GetRowNum(size_t row, bool check=true)
-#endif
     {
         if (check && row>=fTable.num_rows)
@@ -847 +841 @@
     bool GetNextRow(bool check=true)
     {
-#if !defined(__MARS__) && !defined(__CINT__)
         return GetRow(fRow+1, check);
-#else
-        return GetRowNum(fRow+1, check);
-#endif
     }