Index: /trunk/Mars/mcore/fits.h
===================================================================
--- /trunk/Mars/mcore/fits.h	(revision 17292)
+++ /trunk/Mars/mcore/fits.h	(revision 17293)
@@ -11,10 +11,12 @@
 #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,9 +491,5 @@
     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,9 +815,5 @@
     }
 
-#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,9 +841,5 @@
     bool GetNextRow(bool check=true)
     {
-#if !defined(__MARS__) && !defined(__CINT__)
         return GetRow(fRow+1, check);
-#else
-        return GetRowNum(fRow+1, check);
-#endif
     }