Changeset 14935 for trunk/Mars/mcore/DrsCalib.h

Timestamp:

02/20/13 14:49:37 (12 years ago)

Author:

tbretz

Message:

Add changes necessary to remove fits completely from namespace std in MARS.

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (3 diffs)

trunk/Mars/mcore/DrsCalib.h

@@ -5 +5 @@
 #include <errno.h>  // errno
 
+#ifndef MARS_fits
 #include "fits.h"
+#endif
+
+#ifndef MARS_ofits
 #include "ofits.h"
+#endif
 
 #ifdef __MARS__
@@ -929 +934 @@
     std::string ReadFitsImp(const std::string &str, std::vector<float> &vec)
     {
+#ifndef __MARS__
         std::fits file(str);
+#else
+        fits file(str);
+#endif
         if (!file)
         {
@@ -1054 +1063 @@
         const size_t n = 1440*1024*4 + 1440*fRoi*2 + fNumTm*fRoi*2 + 3;
 
+#ifndef __MARS__
         std::ofits file(filename.c_str());
+#else
+        ofits file(filename.c_str());
+#endif
         if (!file)
         {