Merge pull request #500 from jpanetta/master

Fix some compilation warnings in viewer/EmbreeIntersector

Former-commit-id: 139604ff4d4bedb8e9c8cf3ad56a08fa46704eee

include/igl/embree/EmbreeIntersector.h

@@ -228,8 +228,8 @@ inline igl::embree::EmbreeIntersector::EmbreeIntersector()
   :
   //scene(NULL),
   geomID(0),
-  triangles(NULL),
   vertices(NULL),
+  triangles(NULL),
   initialized(false)
 {
 }
@@ -239,8 +239,8 @@ inline igl::embree::EmbreeIntersector::EmbreeIntersector(
   :// To make -Weffc++ happy
   //scene(NULL),
   geomID(0),
-  triangles(NULL),
   vertices(NULL),
+  triangles(NULL),
   initialized(false)
 {
   assert(false && "Embree: Copying EmbreeIntersector is not allowed");

include/igl/viewer/Viewer.cpp

@@ -205,7 +205,7 @@ namespace viewer
     ngui->setFixedSize(Eigen::Vector2i(60,20));
 
     // Create nanogui widgets
-    nanogui::Window *window = ngui->addWindow(Eigen::Vector2i(10,10),"libIGL-Viewer");
+    /* nanogui::Window *window = */ ngui->addWindow(Eigen::Vector2i(10,10),"libIGL-Viewer");
 
     // ---------------------- LOADING ----------------------
 

include/igl/viewer/Viewer.h

@@ -36,7 +36,7 @@
 namespace nanogui { class FormHelper; class Screen; }
 #endif
 
-class GLFWwindow;
+struct GLFWwindow;
 
 namespace igl
 {