Clang compile fixes

This commit is contained in:
Alexander Bock
2016-06-29 16:40:20 +02:00
parent 3a0a1b97d1
commit a56ce8d3f5
3 changed files with 5 additions and 3 deletions
+2 -1
View File
@@ -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;
@@ -28,6 +28,7 @@
#include <modules/onscreengui/include/guicomponent.h>
#include <functional>
#include <string>
#include <vector>
namespace openspace {
+2 -2
View File
@@ -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());
}
);