浏览代码

merge bullshit

Former-commit-id: 202801199bc149c3fd1e09fbc88f9ffaf77a5481
Alec Jacobson (jalec 12 年之前
父节点
当前提交
c3b27990f4
共有 1 个文件被更改,包括 13 次插入1 次删除
  1. 13 1
      include/igl/Timer.h

+ 13 - 1
include/igl/Timer.h

@@ -21,7 +21,19 @@ namespace igl
   {
   {
   public:
   public:
     // default constructor
     // 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
 #ifdef WIN32
       QueryPerformanceFrequency(&frequency);
       QueryPerformanceFrequency(&frequency);