Changeset 17849

Timestamp:

05/13/14 17:12:44 (11 years ago)

Author:

tbretz

Message:

Made std::to_string ISDC-prove.

Location:

trunk/Mars/mcore

Files:

• MemoryManager.h (modified) (1 diff)
• zfits.h (modified) (1 diff)

trunk/Mars/mcore/MemoryManager.h

@@ -149 +149 @@
             throw std::runtime_error("Cannot change the chunk size while there is memory in use");
         if (getMaxMemory()<size)
-            throw std::runtime_error("Chunk size ("+std::to_string(size)+") larger than allowed memory ("+std::to_string(getMaxMemory())+")");
+            throw std::runtime_error("Chunk size ("+std::to_string((long long int)size)+") larger than allowed memory ("+std::to_string((long long int)getMaxMemory())+")");
 #else
         if (getInUse() || getMaxMemory()<size)

trunk/Mars/mcore/zfits.h

@@ -51 +51 @@
             return fits::IsFileOk();
 
-        const bool rawsum = GetStr("RAWSUM") == std::to_string(fRawsum.val());
+        const bool rawsum = GetStr("RAWSUM") == std::to_string((long long int)fRawsum.val());
         return fits::IsFileOk() && rawsum;
     };