Changeset 17144 for trunk

Timestamp:

09/07/13 17:25:39 (11 years ago)

Author:

tbretz

Message:

Added the possibility to check for the array size in SetPtrAddress

File:

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

trunk/Mars/mcore/fits.h

@@ -973 +973 @@
     }
 
-    bool SetPtrAddress(const string &name, void *ptr)
+    bool SetPtrAddress(const string &name, void *ptr, size_t cnt=0)
     {
         if (fTable.cols.count(name)==0)
@@ -979 +979 @@
             ostringstream str;
             str <<"SetPtrAddress('" << name << "') - Column not found." << endl;
+#ifdef __EXCEPTIONS
+            throw runtime_error(str.str());
+#else
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
+            return false;
+#endif
+        }
+
+        if (cnt && cnt!=fTable.cols[name].num)
+        {
+            ostringstream str;
+            str << "SetPtrAddress('" << name << "') - Element count mismatch: expected "
+                << fTable.cols[name].num << " from header, got " << cnt << endl;
 #ifdef __EXCEPTIONS
             throw runtime_error(str.str());