Explorar o código

merge bullshit

Former-commit-id: 202801199bc149c3fd1e09fbc88f9ffaf77a5481
Alec Jacobson (jalec %!s(int64=12) %!d(string=hai) anos
pai
achega
c3b27990f4
Modificáronse 1 ficheiros con 13 adicións e 1 borrados
  1. 13 1
      include/igl/Timer.h

+ 13 - 1
include/igl/Timer.h

@@ -21,7 +21,19 @@ namespace igl
   {
   public:
     // default constructor
-    Timer()                       
+    Timer():
+      stopped(0),
+#ifdef WIN32
+      frequency(0),
+      startCount(0),
+      endCount(0)
+#elif __APPLE__
+      startCount(0),
+      endCount(0)
+#else
+      startCount(),
+      endCount()
+#endif
     {
 #ifdef WIN32
       QueryPerformanceFrequency(&frequency);