From 6c5c8d68393b650dc01da9ba1676ddd89f8b0e69 Mon Sep 17 00:00:00 2001 From: Emil Axelsson Date: Mon, 10 Oct 2016 17:36:55 +0200 Subject: [PATCH 1/2] Make gcc happy --- include/openspace/engine/configurationmanager.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/openspace/engine/configurationmanager.h b/include/openspace/engine/configurationmanager.h index 7dfce32982..b826094735 100644 --- a/include/openspace/engine/configurationmanager.h +++ b/include/openspace/engine/configurationmanager.h @@ -109,15 +109,15 @@ public: /// The key that stores the http proxy settings for the downloadmanager static const std::string KeyHttpProxy; /// The key that stores the address of the http proxy - static const std::string ConfigurationManager::PartHttpProxyAddress; + static const std::string PartHttpProxyAddress; /// The key that stores the port of the http proxy - static const std::string ConfigurationManager::PartHttpProxyPort; + static const std::string PartHttpProxyPort; /// The key that stores the authentication method of the http proxy - static const std::string ConfigurationManager::PartHttpProxyAuthentication; + static const std::string PartHttpProxyAuthentication; /// The key that stores the username to use for authentication to access the http proxy - static const std::string ConfigurationManager::PartHttpProxyUser; + static const std::string PartHttpProxyUser; /// The key that stores the password to use for authentication to access the http proxy - static const std::string ConfigurationManager::PartHttpProxyPassword; + static const std::string PartHttpProxyPassword; /** From e21b69cab8cc655de593efa86618cd5cc3a96fd9 Mon Sep 17 00:00:00 2001 From: Emil Axelsson Date: Mon, 10 Oct 2016 17:46:26 +0200 Subject: [PATCH 2/2] Remove sgct dependency from renderengine --- src/rendering/renderengine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 9225cc9090..8ca2af7cd7 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -83,7 +83,6 @@ #include #include -#include #include // ABuffer defines