Changeset 1157 for XIOS/dev/branch_yushan_merged/src/timer.cpp

Timestamp:

06/06/17 17:09:31 (7 years ago)

Author:

yushan

Message:

branch re-merged with trunk @1156

File:

• XIOS/dev/branch_yushan_merged/src/timer.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/src/timer.cpp

@@ -6 +6 @@
 #include <sstream>
 #include "tracer.hpp"
+#include <iostream>
+#include <sstream>
 
 namespace xios
@@ -61 +63 @@
     // return it->second;
 
-    if(allTimer_ptr == NULL) allTimer_ptr = new std::map<std::string,CTimer>;
+    if(allTimer_ptr == 0) allTimer_ptr = new std::map<std::string,CTimer>;
 
     std::map<std::string,CTimer>::iterator it = (*allTimer_ptr).find(name);
@@ -71 +73 @@
   string CTimer::getAllCumulatedTime(void)
   {
+    if(allTimer_ptr == 0) allTimer_ptr = new std::map<std::string,CTimer>;
+
     std::ostringstream strOut ;
-    for(std::map<std::string,CTimer>::iterator it=allTimer.begin();it!=allTimer.end();++it)
+    for(std::map<std::string,CTimer>::iterator it=(*allTimer_ptr).begin();it!=(*allTimer_ptr).end();++it)
       strOut<<"Timer : "<<it->first<<"    -->   cumulated time : "<<it->second.getCumulatedTime()<<std::endl ;
     return strOut.str() ;
   }
+
 }