Changeset 17274 for trunk/Mars/mcore/factfits.h

Timestamp:

10/20/13 17:28:37 (11 years ago)

Author:

tbretz

Message:

Added more missing std::

File:

• trunk/Mars/mcore/factfits.h (modified) (6 diffs)

trunk/Mars/mcore/factfits.h

@@ -135 +135 @@
         if (calib.bad())
         {
-            clear(rdstate()|ios::badbit);
+            clear(rdstate()|std::ios::badbit);
             return;
         }
@@ -145 +145 @@
         if (calib.GetNumRows() != 1)
         {
-            clear(rdstate()|ios::badbit);
-#ifdef __EXCEPTIONS
-            throw runtime_error("Table 'ZDrsCellOffsets' found, but not with one row as expected");
+            clear(rdstate()|std::ios::badbit);
+#ifdef __EXCEPTIONS
+            throw std::runtime_error("Table 'ZDrsCellOffsets' found, but not with one row as expected");
 #else
             gLog << ___err___ << "ERROR - Table 'ZDrsCellOffsets' found, but not with one row as expected" << endl;
@@ -155 +155 @@
         if (calib.GetStr("TTYPE1") != "OffsetCalibration")
         {
-            clear(rdstate()|ios::badbit);
-#ifdef __EXCEPTIONS
-            throw runtime_error("Table 'DrsCalib' found, but first column is not the one expected");
+            clear(rdstate()|std::ios::badbit);
+#ifdef __EXCEPTIONS
+            throw std::runtime_error("Table 'DrsCalib' found, but first column is not the one expected");
 #else
             gLog << ___err___ << "ERROR - Table 'DrsCalib' found, but first column is not the one expected" << endl;
@@ -165 +165 @@
         if (calib.GetStr("TFORM1") != "1474560I")  // 1024*1440
         {
-            clear(rdstate()|ios::badbit);
-#ifdef __EXCEPTIONS
-            throw runtime_error("Table 'DrsCalib' has wrong column format (TFROM1)");
+            clear(rdstate()|std::ios::badbit);
+#ifdef __EXCEPTIONS
+            throw std::runtime_error("Table 'DrsCalib' has wrong column format (TFROM1)");
 #else
             gLog << ___err___ << "ERROR - Table 'DrsCalib' has wrong column format (TFORM1)" << endl;
@@ -180 +180 @@
             return;
 
-        clear(rdstate()|ios::badbit);
-
-#ifdef __EXCEPTIONS
-        throw runtime_error("Reading column 'OffsetCalibration' failed.");
+        clear(rdstate()|std::ios::badbit);
+
+#ifdef __EXCEPTIONS
+        throw std::runtime_error("Reading column 'OffsetCalibration' failed.");
 #else
         gLog << ___err___ << "ERROR - Reading column 'OffsetCalibration' failed." << endl;
@@ -190 +190 @@
     }
 
-    vector<int16_t> fOffsetCalibration; ///< integer values of the drs calibration used for compression
+    std::vector<int16_t> fOffsetCalibration; ///< integer values of the drs calibration used for compression
 
     size_t fOffsetStartCellData;