Changeset 17559 for trunk/Mars

Timestamp:

02/19/14 16:54:25 (11 years ago)

Author:

aparavac

Message:

Added compatibilty for gcc 4.7 and c11 std

Location:

trunk/Mars

Files:

• mbase/MStatusDisplay.cc (modified) (1 diff)
• mcore/ofits.h (modified) (1 diff)
• mfileio/MWriteFitsFile.cc (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (1 diff)

trunk/Mars/mbase/MStatusDisplay.cc

@@ -2916 +2916 @@
 
         ps->SetTextAlign(21); // cent bottom
-        PSToolsTextNDC(*ps, 0.50, top+off, TString("MARS V"MARSVER" - Modular Analysis and Reconstruction Software - ")+d.AsString());
+        PSToolsTextNDC(*ps, 0.50, top+off, TString("MARS V" MARSVER " - Modular Analysis and Reconstruction Software - ")+d.AsString());
 
         ps->SetTextAlign(31); // right bottom

trunk/Mars/mcore/ofits.h

@@ -993 +993 @@
         SetStr("CREATOR", typeid(*this).name(), "Class that wrote this file");
         SetFloat("EXTREL", 1.0, "Release Number");
-        SetStr("COMPILED", __DATE__" "__TIME__, "Compile time");
+        SetStr("COMPILED", __DATE__" " __TIME__, "Compile time");
         SetStr("ORIGIN", "FACT", "Institution that wrote the file");
         SetStr("TIMESYS", "UTC", "Time system");

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -349 +349 @@
     SetHeaderKey("CREATOR", "Ceres", "");
     SetHeaderKey("EXTREL", 1., "");
-    SetHeaderKey("COMPILED", __DATE__" "__TIME__, "");
+    SetHeaderKey("COMPILED", __DATE__" " __TIME__, "");
     //SetHeaderKey("REVISION", "0", "");
     SetHeaderKey("ORIGIN", "FACT", "");

trunk/Mars/mjobs/MJSimulation.cc

@@ -270 +270 @@
     write.SetHeaderKey("CREATOR", "Ceres", "");
     write.SetHeaderKey("EXTREL", 1., "");
-    write.SetHeaderKey("COMPILED", __DATE__" "__TIME__, "");
+    write.SetHeaderKey("COMPILED", __DATE__" " __TIME__, "");
     write.SetHeaderKey("REVISION", "0", "");
     write.SetHeaderKey("ORIGIN", "FACT", "");