mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-08 22:38:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/time

Browse Source
This commit is contained in:
Alexander Bock
2014-09-15 00:16:33 +02:00
parent c48b35a7ce 3ae37d0991
commit a81547f40e
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/properties/numericalproperty.inl
View File

@@ -181,16 +181,16 @@ template <typename T>
bool NumericalProperty<T>::setLua(lua_State* state)
{
bool success;
T value = PropertyDelegate<NumericalProperty<T>>::fromLuaValue<T>(state, success);
T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(state, success);
if (success)
set(value);
TemplateProperty<T>::setValue(value);
return success;
}
template <typename T>
bool NumericalProperty<T>::getLua(lua_State* state) const
{
bool success = PropertyDelegate<NumericalProperty<T>>::toLuaValue<T>(state, TemplateProperty::_value);
bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(state, TemplateProperty<T>::_value);
return success;
}

4
include/openspace/properties/templateproperty.inl
View File

@@ -183,7 +183,7 @@ template <typename T>
bool TemplateProperty<T>::setLua(lua_State* state)
{
bool success;
T value = PropertyDelegate<TemplateProperty<T>>::fromLuaValue<T>(state, success);
T value = PropertyDelegate<TemplateProperty<T>>::template fromLuaValue<T>(state, success);
if (success)
set(value);
return success;
@@ -192,7 +192,7 @@ bool TemplateProperty<T>::setLua(lua_State* state)
template <typename T>
bool TemplateProperty<T>::getLua(lua_State* state) const
{
bool success = PropertyDelegate<TemplateProperty<T>>::toLuaValue<T>(state, _value);
bool success = PropertyDelegate<TemplateProperty<T>>::template toLuaValue<T>(state, _value);
return success;
}

4
include/openspace/tests/test_luaconversions.inl
View File

@@ -64,7 +64,7 @@ TEST_F(LuaConversionTest, LuaExecution) {
= PropertyDelegate<TemplateProperty<__TYPE__>>::toLuaValue<__TYPE__>( \
state, __VALUE__); \
EXPECT_TRUE(success) << "toLuaValue"; \
__TYPE__ value = __TYPE__(0); \
__TYPE__ value = (__TYPE__)(0); \
value = PropertyDelegate<TemplateProperty<__TYPE__>>::fromLuaValue<__TYPE__>( \
state, success); \
EXPECT_TRUE(success) << "fromLuaValue"; \
@@ -79,7 +79,7 @@ TEST_F(LuaConversionTest, LuaExecution) {
= PropertyDelegate<NumericalProperty<__TYPE__>>::toLuaValue<__TYPE__>( \
state, __VALUE__); \
EXPECT_TRUE(success) << "toLuaValue"; \
__TYPE__ value = __TYPE__(0); \
__TYPE__ value = (__TYPE__)(0); \
value = PropertyDelegate<NumericalProperty<__TYPE__>>::fromLuaValue<__TYPE__>( \
state, success); \
EXPECT_TRUE(success) << "fromLuaValue"; \

2
include/openspace/tests/test_spicemanager.inl
View File

@@ -223,7 +223,7 @@ TEST_F(SpiceManagerTest, stringToEphemerisTime){
double ephemerisTime;
double control_ephemerisTime;
char *date = "Thu Mar 20 12:53:29 PST 1997";
char date[SRCLEN] = "Thu Mar 20 12:53:29 PST 1997";
str2et_c(date, &control_ephemerisTime);
ephemerisTime = openspace::SpiceManager::ref().convertStringToTdbSeconds(date);

2
src/util/spicemanager.cpp
View File

@@ -21,9 +21,11 @@
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <stdio.h>
#include <iostream>
#include <cassert>
#include <cstring>
#ifdef WIN32
#include <Windows.h>