Index: trunk/Mars/mcore/fits.h
===================================================================
--- trunk/Mars/mcore/fits.h	(revision 12328)
+++ trunk/Mars/mcore/fits.h	(revision 12329)
@@ -22,9 +22,11 @@
 #include <iostream>
 #define gLog cerr
-#define err ""
-#define all ""
+#define ___err___ ""
+#define ___all___ ""
 #else
 #include "MLog.h"
 #include "MLogManip.h"
+#define ___err___ err
+#define ___all___ all
 #endif
 
@@ -108,5 +110,5 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return false;
 #endif
@@ -120,5 +122,5 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return false;
 #endif
@@ -132,5 +134,5 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return false;
 #endif
@@ -261,5 +263,5 @@
                         throw runtime_error(str.str());
 #else
-                        gLog << err << "ERROR - " << str.str() << endl;
+                        gLog << ___err___ << "ERROR - " << str.str() << endl;
                         return;
 #endif
@@ -278,5 +280,5 @@
                 throw runtime_error("Column size mismatch");
 #else
-                gLog << err << "ERROR - Column size mismatch" << endl;
+                gLog << ___err___ << "ERROR - Column size mismatch" << endl;
                 return;
 #endif
@@ -303,5 +305,5 @@
                     continue;
 
-                gLog << all << setw(2) << it->second.type << '|' << it->first << '=' << it->second.value << '/' << it->second.comment << '|' << endl;
+                gLog << ___all___ << setw(2) << it->second.type << '|' << it->first << '=' << it->second.value << '/' << it->second.comment << '|' << endl;
             }}
 
@@ -317,5 +319,5 @@
             for (Sorted::const_iterator it=sorted.begin(); it!=sorted.end(); it++)
             {
-                gLog << all << setw(6) << it->second.offset << "| ";
+                gLog << ___all___ << setw(6) << it->second.offset << "| ";
                 gLog << it->second.num << 'x';
                 switch (it->second.type)
@@ -352,5 +354,5 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return 0;
 #endif
@@ -448,5 +450,5 @@
             throw runtime_error("File is not a FITS file.");
 #else
-            gLog << err << "ERROR - File is not a FITS file." << endl;
+            gLog << ___err___ << "ERROR - File is not a FITS file." << endl;
             return;
 #endif
@@ -468,5 +470,5 @@
                     throw runtime_error("FITS file corrupted.");
 #else
-                    gLog << err << "ERROR - FITS file corrupted." << endl;
+                    gLog << ___err___ << "ERROR - FITS file corrupted." << endl;
                     return;
 #endif
@@ -509,5 +511,5 @@
                 seekg((blks+(rest>0?1:0))*(36*80), ios::cur);
                 if (!good())
-                     gLog << err << "File seems to be incomplete (less data than expected from header)." << endl;
+                     gLog << ___err___ << "File seems to be incomplete (less data than expected from header)." << endl;
 
                 fRow   = fTable.num_rows;
@@ -591,5 +593,5 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif
@@ -604,5 +606,5 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif
@@ -617,5 +619,5 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif
@@ -664,5 +666,5 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif