comparison base/Profiler.h @ 1365:3382d914e110

Merge from branch 3.0-integration

 #ifndef _PROFILER_H_
 #define _PROFILER_H_
 
 #include "system/System.h"
 
-#include <ctime>
-#include <sys/time.h>
 #include <map>
 
 #include "RealTime.h"
 
 //#define NO_TIMING 1

 
 #ifdef NDEBUG
 #ifndef WANT_TIMING
 #define NO_TIMING 1
 #endif
+#endif
+
+#ifndef NO_TIMING
+#include <ctime>
+#include <sys/time.h>
 #endif
 
 /**
  * Profiling classes
  */

 {
 public:
     static Profiles* getInstance();
     ~Profiles();
 
+#ifndef NO_TIMING
     void accumulate(const char* id, clock_t time, RealTime rt);
+#endif
     void dump() const;
 
 protected:
     Profiles();
 
+#ifndef NO_TIMING
     typedef std::pair<clock_t, RealTime> TimePair;
     typedef std::pair<int, TimePair> ProfilePair;
     typedef std::map<const char *, ProfilePair> ProfileMap;
     typedef std::map<const char *, TimePair> LastCallMap;
     typedef std::map<const char *, TimePair> WorstCallMap;
     ProfileMap m_profiles;
     LastCallMap m_lastCalls;
     WorstCallMap m_worstCalls;
+#endif
 
     static Profiles* m_instance;
 };
 
 #ifndef NO_TIMING