Changeset 17304 for trunk/Mars/mcore/ofits.h

Timestamp:

10/22/13 10:24:02 (11 years ago)

Author:

lyard

Message:

Adapted compilation on older Gcc

File:

• trunk/Mars/mcore/ofits.h (modified) (5 diffs)

trunk/Mars/mcore/ofits.h

@@ -13 +13 @@
 #include <stdexcept>
 
+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+
 #ifdef __CINT__
 #define off_t size_t
@@ -95 +97 @@
 
             //transform(key.begin(), key.end(), key.begin(), toupper);
-
+#if GCC_VERSION < 40603
+            for (std::string::const_iterator c=key.begin(); c<key.end(); c++)
+#else
             for (std::string::const_iterator c=key.cbegin(); c<key.cend(); c++)
+#endif
                 if ((*c<'A' || *c>'Z') && (*c<'0' || *c>'9') && *c!='-' && *c!='_')
                 {
@@ -116 +121 @@
             comment = Trim(comment);
 
+#if GCC_VERSION < 40603
+            for (std::string::const_iterator c=key.begin(); c<key.end(); c++)
+#else
             for (std::string::const_iterator c=key.cbegin(); c<key.cend(); c++)
+#endif
                 if (*c<32 || *c>126)
                 {
@@ -587 +596 @@
 
         static const std::string allow("LABIJKEDQ");
+#if GCC_VERSION < 40603
+        if (std::find(allow.begin(), allow.end(), typechar)==allow.end())
+#else
         if (std::find(allow.cbegin(), allow.cend(), typechar)==allow.end())
+#endif
         {
             std::ostringstream sout;
@@ -610 +623 @@
         if (addHeaderKeys)
         {
+#if GCC_VERSION < 40603
+            const std::string nc = std::to_string((long long int)(fTable.num_cols));
+#else
             const std::string nc = std::to_string(fTable.num_cols);
-
+#endif
             SetStr("TFORM"+nc, type.str(), "format of "+name+" "+CommentFromType(typechar));
             SetStr("TTYPE"+nc, name, comment);