Răsfoiți Sursa

fixing some nasty linking error caused by static inline in h and cpp file (better never ever user static inlining...)

Johannes Ruehle 11 ani în urmă
părinte
comite
2d86618a2f
2 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      core/basics/Timer.cpp
  2. 1 1
      core/basics/Timer.h

+ 1 - 1
core/basics/Timer.cpp

@@ -169,7 +169,7 @@ void Timer::reset() {
   sumAbsolute = 0.0;
 }
 
- inline double Timer::convertTime ( const struct timeval &time ) {
+double Timer::convertTime ( const struct timeval &time ) {
 #ifndef WIN32
       return double ( time.tv_sec ) + double ( time.tv_usec ) * 1e-6;
 #else

+ 1 - 1
core/basics/Timer.h

@@ -197,7 +197,7 @@ class Timer {
      * (00:00:00 UTC, January 1, 1970)
      * @return double value of time in seconds
      */
-    static inline double convertTime ( const struct timeval &time );
+    static double convertTime ( const struct timeval &time );
 
     /**
      * Date string from time since Epoch (00:00:00 UTC, January 1, 1970),