mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-24 13:59:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

More compile fixes for Jenkins

Browse Source
This commit is contained in:
Alexander Bock
2014-09-14 23:46:02 +02:00
parent 1f7f4016ae
commit b30de7726e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ bool NumericalProperty<T>::setLua(lua_State* state)
bool success;
T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(state, success);
if (success)
set(value);
setValue(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"; \