Changeset 11461 for trunk/Mars

Timestamp:

07/19/11 11:13:33 (13 years ago)

Author:

tbretz

Message:

Made also Entry public -- for newer root versions and moved ReadBlock down.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MFits.h (modified) (3 diffs)

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2011/07/19 Thomas Bretz
+
+   * mbase/MFits.h:
+     - made struct Entry public (needed by newer root versions)
+
+
 
  2011/07/18 Thomas Bretz

trunk/Mars/mbase/MFits.h

@@ -33 +33 @@
 class MFits : public MZlib
 {
+public:
     struct Entry
     {
@@ -51 +52 @@
     };
 
-    vector<string> ReadBlock(vector<string> &vec)
-    {
-        bool end = false;
-        for (int i=0; i<36; i++)
-        {
-            char c[81];
-            c[80] = 0;
-            read(c, 80);
-            if (!good())
-                break;
-
-            if (c[0]==0)
-                return vector<string>();
-
-            string str(c);
-
-            //if (!str.empty())
-            //    cout << setw(2) << i << "|" << str << "|" << endl;
-
-            if (str=="END                                                                             ")
-                end = true;
-
-            if (end)
-                continue;
-
-            vec.push_back(str);
-        }
-
-        return vec;
-    }
-
-public:
     struct Table
     {
@@ -332 +301 @@
     size_t fRow;
 
+    vector<string> ReadBlock(vector<string> &vec)
+    {
+        bool end = false;
+        for (int i=0; i<36; i++)
+        {
+            char c[81];
+            c[80] = 0;
+            read(c, 80);
+            if (!good())
+                break;
+
+            if (c[0]==0)
+                return vector<string>();
+
+            string str(c);
+
+            //if (!str.empty())
+            //    cout << setw(2) << i << "|" << str << "|" << endl;
+
+            if (str=="END                                                                             ")
+                end = true;
+
+            if (end)
+                continue;
+
+            vec.push_back(str);
+        }
+
+        return vec;
+    }
+
     string Compile(const string &key, int16_t i=-1)
     {