Index: trunk/Mars/mcore/ofits.h
===================================================================
--- trunk/Mars/mcore/ofits.h	(revision 12999)
+++ trunk/Mars/mcore/ofits.h	(revision 13000)
@@ -44,12 +44,12 @@
         {
             // Trim Both leading and trailing spaces
-            const size_t start = str.find_first_not_of(' '); // Find the first character position after excluding leading blank spaces
-            const size_t end   = str.find_last_not_of(' ');  // Find the first character position from reverse af
+            const size_t first = str.find_first_not_of(' '); // Find the first character position after excluding leading blank spaces
+            const size_t last  = str.find_last_not_of(' ');  // Find the first character position from reverse af
 
             // if all spaces or empty return an empty string
-            if (string::npos==start || string::npos==end)
+            if (string::npos==first || string::npos==last)
                 return string();
 
-            return str.substr(start, end-start+1);
+            return str.substr(first, last-first+1);
         }
 
@@ -150,26 +150,26 @@
         string Compile()
         {
-            ostringstream out;
-            out << std::left << setw(8) << key;
+            ostringstream sout;
+            sout << std::left << setw(8) << key;
 
             if (!delim)
             {
-                out << "  " << comment;
-                return out.str();
+                sout << "  " << comment;
+                return sout.str();
             }
 
-            out << "= ";
-            out << (value[0]=='\''?std::left:std::right);
-            out << setw(20) << value << std::left;
+            sout << "= ";
+            sout << (value[0]=='\''?std::left:std::right);
+            sout << setw(20) << value << std::left;
 
             if (comment.size()>0)
-                out << " / " << comment;
-
-            return out.str();
+                sout << " / " << comment;
+
+            return sout.str();
         }
 
         Checksum checksum;
 
-        void Out(ofstream &out)
+        void Out(ofstream &fout)
         {
             if (!changed)
@@ -180,10 +180,10 @@
 
             if (offset==0)
-                offset = out.tellp();
+                offset = fout.tellp();
 
             //cout << "Write[" << offset << "]: " << key << "/" << value << endl;
 
-            out.seekp(offset);
-            out << str;
+            fout.seekp(offset);
+            fout << str;
 
             checksum.reset();
@@ -192,5 +192,5 @@
             changed = false;
         }
-
+        /*
         void Out(ostream &out)
         {
@@ -201,5 +201,5 @@
             out << str;
             changed = false;
-        }
+        }*/
     };
 
@@ -354,24 +354,24 @@
     bool SetInt(const string &key, int64_t i, const string &comment="")
     {
-        ostringstream out;
-        out << i;
-
-        return Set(key, true, out.str(), comment);
+        ostringstream sout;
+        sout << i;
+
+        return Set(key, true, sout.str(), comment);
     }
 
     bool SetFloat(const string &key, double f, int p, const string &comment="")
     {
-        ostringstream out;
+        ostringstream sout;
 
         if (p<0)
-            out << setprecision(-p) << fixed;
+            sout << setprecision(-p) << fixed;
         if (p>0)
-            out << setprecision(p);
+            sout << setprecision(p);
         if (p==0)
-            out << setprecision(f>1e-100 && f<1e100 ? 15 : 14);
-
-        out << f;
-
-        string str = out.str();
+            sout << setprecision(f>1e-100 && f<1e100 ? 15 : 14);
+
+        sout << f;
+
+        string str = sout.str();
 
         replace(str.begin(), str.end(), 'e', 'E');
@@ -390,7 +390,7 @@
     bool SetHex(const string &key, uint64_t i, const string &comment="")
     {
-        ostringstream out;
-        out << hex << "0x" << i;
-        return SetStr(key, out.str(), comment);
+        ostringstream sout;
+        sout << std::hex << "0x" << i;
+        return SetStr(key, sout.str(), comment);
     }