update gcc compiler to 4.9

wjakob · Oct 17, 2019 · 76f1865 · 76f1865
1 parent 7a311ee
commit 76f1865
Show file tree

Hide file tree

Showing 17 changed files with 130 additions and 114 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,16 +9,23 @@ branches:
 
 matrix:
   include:
+    - os: windows
+      script:     
+        - mkdir -p build
+        - cd build
+        - cmake --version 
+        - cmake  ..
+        - cmake --build .
     - os: linux
-      compiler: gcc-4.8
+      compiler: gcc-4.9
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
             - deadsnakes
             - kubuntu-backports
           packages:
-            - g++-4.8
+            - g++-4.9
             - python3.5
             - python3.5-dev
             - python3.5-venv

diff --git a/include/nanogui/editworkspace.h b/include/nanogui/editworkspace.h
@@ -127,11 +127,11 @@ class NANOGUI_EXPORT EditorWorkspace : public Widget
     void saveSelectedElementToJson();
 
 private:
-	
+
     EditMode getModeFromPos(const Vector2i &p);
 
     std::function<void(Widget*)> mWidgetSelectedCallback;
-    
+
     //void _createEditorMenu();
     //void _createElementsWindow();
     void _drawSelectedElement(NVGcontext* ctx);
@@ -156,7 +156,7 @@ class NANOGUI_EXPORT EditorWorkspace : public Widget
     Window* _optionsWindow;
     //ChangesManager* _changesManager;
 
-    struct {     
+    struct {
       Vector4i topleft;
       Vector4i topright;
       Vector4i top;

diff --git a/include/nanogui/foldout.h b/include/nanogui/foldout.h
@@ -50,7 +50,7 @@ class NANOGUI_EXPORT Foldout : public Widget
 	//virtual void save(* out ) const;
   //virtual void load(* in );
 protected:
-    
+
     void _reparseChilds();
     void _updateChilds();
     void _resizeEvent();