From a56ce8d3f5534282bd0ae318386e39cf5064ca25 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 29 Jun 2016 16:40:20 +0200
Subject: [PATCH] Clang compile fixes

---
 include/openspace/util/camera.h                    | 3 ++-
 modules/onscreengui/include/guipropertycomponent.h | 1 +
 src/engine/openspaceengine.cpp                     | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h
index ce80f10dbe..4132dde173 100644
--- a/include/openspace/util/camera.h
+++ b/include/openspace/util/camera.h
@@ -29,7 +29,7 @@
 
 // open space includes
 #include <openspace/util/powerscaledcoordinate.h>
-//#include <openspace/util/syncbuffer.h>
+#include <openspace/util/syncbuffer.h>
 #include <openspace/rendering/renderengine.h>
 
 // glm includes
@@ -38,6 +38,7 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/quaternion.hpp>
 
+
 namespace openspace {
     class SyncBuffer;
 
diff --git a/modules/onscreengui/include/guipropertycomponent.h b/modules/onscreengui/include/guipropertycomponent.h
index 6111fdcef3..f2da30b236 100644
--- a/modules/onscreengui/include/guipropertycomponent.h
+++ b/modules/onscreengui/include/guipropertycomponent.h
@@ -28,6 +28,7 @@
 #include <modules/onscreengui/include/guicomponent.h>
 
 #include <functional>
+#include <string>
 #include <vector>
 
 namespace openspace {
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 3dd53c0be4..8455fda46f 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -447,14 +447,14 @@ bool OpenSpaceEngine::initialize() {
 
     OsEng.gui()._screenSpaceProperty.setSource(
         [&]() {
-            auto& ssr = renderEngine().screenSpaceRenderables();
+            const auto& ssr = renderEngine().screenSpaceRenderables();
             return std::vector<properties::PropertyOwner*>(ssr.begin(), ssr.end());
         }
     );
 
     OsEng.gui()._property.setSource(
         [&]() {
-            auto& nodes = renderEngine().scene()->allSceneGraphNodes();
+            const auto& nodes = renderEngine().scene()->allSceneGraphNodes();
             return std::vector<properties::PropertyOwner*>(nodes.begin(), nodes.end());
         }
     );