From 3ba9cbdb9697b21e82a26e1cbb2bc45d028eb812 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 23 Feb 2015 14:18:21 +0100 Subject: [PATCH] Linux compile fix --- include/openspace/util/powerscaledcoordinate.h | 2 +- src/util/factorymanager.cpp | 4 ++-- src/util/powerscaledcoordinate.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/openspace/util/powerscaledcoordinate.h b/include/openspace/util/powerscaledcoordinate.h index e17a9bfe22..3727ba7646 100644 --- a/include/openspace/util/powerscaledcoordinate.h +++ b/include/openspace/util/powerscaledcoordinate.h @@ -62,7 +62,7 @@ public: glm::vec3 vec3() const; // return the full psc as dvec4() - glm::dvec4& dvec4() const; + glm::dvec4 dvec4() const; // rescaled return as dvec3 glm::dvec3 dvec3() const; diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp index ca28b69ea0..4dac141501 100644 --- a/src/util/factorymanager.cpp +++ b/src/util/factorymanager.cpp @@ -48,8 +48,8 @@ // projection #include -#include -#include +#include +#include // std diff --git a/src/util/powerscaledcoordinate.cpp b/src/util/powerscaledcoordinate.cpp index 0b7ef0dcc2..1825109c89 100644 --- a/src/util/powerscaledcoordinate.cpp +++ b/src/util/powerscaledcoordinate.cpp @@ -106,7 +106,7 @@ glm::vec3 PowerScaledCoordinate::vec3() const _vec[2] * pow(k, _vec[3])); } -glm::dvec4& PowerScaledCoordinate::dvec4() const +glm::dvec4 PowerScaledCoordinate::dvec4() const { //return _vec; return glm::dvec4(_vec);