[Orxonox-commit 6440] r11097 - in code/trunk: cmake src/libraries/util test/core/command test/core/object
landauf at orxonox.net
landauf at orxonox.net
Mon Jan 25 21:47:55 CET 2016
Author: landauf
Date: 2016-01-25 21:47:54 +0100 (Mon, 25 Jan 2016)
New Revision: 11097
Modified:
code/trunk/cmake/LibraryConfig.cmake
code/trunk/cmake/LibraryConfigTardis.cmake
code/trunk/src/libraries/util/StringUtils.cc
code/trunk/test/core/command/FunctorTest.cc
code/trunk/test/core/object/ObjectListTest.cc
code/trunk/test/core/object/StrongPtrTest.cc
code/trunk/test/core/object/WeakPtrTest.cc
Log:
fixed build on tardis.
Modified: code/trunk/cmake/LibraryConfig.cmake
===================================================================
--- code/trunk/cmake/LibraryConfig.cmake 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/cmake/LibraryConfig.cmake 2016-01-25 20:47:54 UTC (rev 11097)
@@ -161,9 +161,7 @@
SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
1.53.0)
-IF(NOT TARDIS)
- FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
-ENDIF()
+FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
# No auto linking, so this option is useless anyway
MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
Modified: code/trunk/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/trunk/cmake/LibraryConfigTardis.cmake 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/cmake/LibraryConfigTardis.cmake 2016-01-25 20:47:54 UTC (rev 11097)
@@ -39,33 +39,6 @@
# SET(CMAKE_C_COMPILER "gcc-4.1.1")
# SET(CMAKE_CXX_COMPILER "g++-4.1.1")
- # Note: When setting ENV${} variables, make sure to use quotes when
- # having multiple directories.
- #SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.42.0-bs/include")
- #SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.42.0-bs/i686-debian-linux4.0/lib")
- SET(Boost_VERSION 104200)
- SET(Boost_INCLUDE_DIRS "/usr/pack/boost-1.42.0-bs/include" CACHE PATH "")
- SET(Boost_SYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_system.so" CACHE PATH "")
- SET(Boost_SYSTEM_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_system-d.so" CACHE PATH "")
- SET(Boost_DATE_TIME_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_date_time.so" CACHE PATH "")
- SET(Boost_DATE_TIME_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_date_time-d.so" CACHE PATH "")
- SET(Boost_FILESYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_filesystem.so" CACHE PATH "")
- SET(Boost_FILESYSTEM_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_filesystem-d.so" CACHE PATH "")
- SET(Boost_THREAD_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_thread-mt.so" CACHE PATH "")
- SET(Boost_THREAD_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_thread-mt-d.so" CACHE PATH "")
-
- SET(Boost_SYSTEM_LIBRARY "debug;${Boost_SYSTEM_LIBRARY_DEBUG};optimized;${Boost_SYSTEM_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
- SET(Boost_DATE_TIME_LIBRARY "debug;${Boost_DATE_TIME_LIBRARY_DEBUG};optimized;${Boost_DATE_TIME_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
- SET(Boost_FILESYSTEM_LIBRARY "debug;${Boost_FILESYSTEM_LIBRARY_DEBUG};optimized;${Boost_FILESYSTEM_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
- SET(Boost_THREAD_LIBRARY "debug;${Boost_THREAD_LIBRARY_DEBUG};optimized;${Boost_THREAD_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
-
- MARK_AS_ADVANCED( Boost_INCLUDE_DIRS )
- MARK_AS_ADVANCED( Boost_SYSTEM_LIBRARY Boost_SYSTEM_LIBRARY_RELEASE Boost_SYSTEM_LIBRARY_DEBUG )
- MARK_AS_ADVANCED( Boost_DATE_TIME_LIBRARY Boost_DATE_TIME_LIBRARY_RELEASE Boost_DATE_TIME_LIBRARY_DEBUG )
- MARK_AS_ADVANCED( Boost_FILESYSTEM_LIBRARY Boost_FILESYSTEM_LIBRARY_RELEASE Boost_FILESYSTEM_LIBRARY_DEBUG )
- MARK_AS_ADVANCED( Boost_THREAD_LIBRARY Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_DEBUG )
-
-
LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
Modified: code/trunk/src/libraries/util/StringUtils.cc
===================================================================
--- code/trunk/src/libraries/util/StringUtils.cc 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/src/libraries/util/StringUtils.cc 2016-01-25 20:47:54 UTC (rev 11097)
@@ -35,6 +35,7 @@
#include <cctype>
#include <ctime>
+#include <memory>
#include "Convert.h"
#include "Math.h"
Modified: code/trunk/test/core/command/FunctorTest.cc
===================================================================
--- code/trunk/test/core/command/FunctorTest.cc 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/test/core/command/FunctorTest.cc 2016-01-25 20:47:54 UTC (rev 11097)
@@ -97,12 +97,12 @@
TEST_F(FunctorTest, ReturnsCorrectParamCount)
{
- EXPECT_EQ(0, createFunctor(&DestroyableClass::method0)->getParamCount());
- EXPECT_EQ(1, createFunctor(&DestroyableClass::method1)->getParamCount());
- EXPECT_EQ(2, createFunctor(&DestroyableClass::method2)->getParamCount());
- EXPECT_EQ(3, createFunctor(&DestroyableClass::method3)->getParamCount());
- EXPECT_EQ(4, createFunctor(&DestroyableClass::method4)->getParamCount());
- EXPECT_EQ(5, createFunctor(&DestroyableClass::method5)->getParamCount());
+ EXPECT_EQ(0u, createFunctor(&DestroyableClass::method0)->getParamCount());
+ EXPECT_EQ(1u, createFunctor(&DestroyableClass::method1)->getParamCount());
+ EXPECT_EQ(2u, createFunctor(&DestroyableClass::method2)->getParamCount());
+ EXPECT_EQ(3u, createFunctor(&DestroyableClass::method3)->getParamCount());
+ EXPECT_EQ(4u, createFunctor(&DestroyableClass::method4)->getParamCount());
+ EXPECT_EQ(5u, createFunctor(&DestroyableClass::method5)->getParamCount());
}
TEST_F(FunctorTest, HasReturnValue)
@@ -662,14 +662,14 @@
EXPECT_EQ(32, (*c7)(4, 8).get<int>());
EXPECT_EQ(8, (*c8)(4).get<int>());
- EXPECT_EQ(1, c1->getParamCount());
- EXPECT_EQ(1, c2->getParamCount());
- EXPECT_EQ(1, c3->getParamCount());
- EXPECT_EQ(2, c4->getParamCount());
- EXPECT_EQ(0, c5->getParamCount());
- EXPECT_EQ(1, c6->getParamCount());
- EXPECT_EQ(2, c7->getParamCount());
- EXPECT_EQ(1, c8->getParamCount());
+ EXPECT_EQ(1u, c1->getParamCount());
+ EXPECT_EQ(1u, c2->getParamCount());
+ EXPECT_EQ(1u, c3->getParamCount());
+ EXPECT_EQ(2u, c4->getParamCount());
+ EXPECT_EQ(0u, c5->getParamCount());
+ EXPECT_EQ(1u, c6->getParamCount());
+ EXPECT_EQ(2u, c7->getParamCount());
+ EXPECT_EQ(1u, c8->getParamCount());
EXPECT_EQ(typeid(int(*)(int)), c1->getFullIdentifier());
EXPECT_EQ(typeid(int(*)(int)), c2->getFullIdentifier());
@@ -767,7 +767,7 @@
FunctorPtr fp1 = createFunctor(&f1);
FunctorPtr fp2 = createFunctor(&f2);
FunctorPtr fp3 = createFunctor(&f3);
- ASSERT_EQ(3, fp2->getParamCount());
+ ASSERT_EQ(3u, fp2->getParamCount());
ASSERT_NE(fp1->getParamCount(), fp3->getParamCount());
ASSERT_FALSE(fp2->hasReturnvalue());
ASSERT_TRUE(fp3->hasReturnvalue());
Modified: code/trunk/test/core/object/ObjectListTest.cc
===================================================================
--- code/trunk/test/core/object/ObjectListTest.cc 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/test/core/object/ObjectListTest.cc 2016-01-25 20:47:54 UTC (rev 11097)
@@ -113,9 +113,9 @@
ListableTest test2(&context1);
ListableTest test3(&context2);
- EXPECT_EQ(3, ObjectList<ListableTest>().size());
- EXPECT_EQ(2, ObjectList<ListableTest>(&context1).size());
- EXPECT_EQ(1, ObjectList<ListableTest>(&context2).size());
+ EXPECT_EQ(3u, ObjectList<ListableTest>().size());
+ EXPECT_EQ(2u, ObjectList<ListableTest>(&context1).size());
+ EXPECT_EQ(1u, ObjectList<ListableTest>(&context2).size());
}
TEST_F(ObjectListTest, CanIterateOverCorrectContext)
Modified: code/trunk/test/core/object/StrongPtrTest.cc
===================================================================
--- code/trunk/test/core/object/StrongPtrTest.cc 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/test/core/object/StrongPtrTest.cc 2016-01-25 20:47:54 UTC (rev 11097)
@@ -256,7 +256,7 @@
vector.push_back(test);
vector.push_back(test);
- ASSERT_EQ(3, vector.size());
+ ASSERT_EQ(3u, vector.size());
EXPECT_EQ(test, vector[0].get());
EXPECT_EQ(test, vector[1].get());
EXPECT_EQ(test, vector[2].get());
Modified: code/trunk/test/core/object/WeakPtrTest.cc
===================================================================
--- code/trunk/test/core/object/WeakPtrTest.cc 2016-01-25 20:33:11 UTC (rev 11096)
+++ code/trunk/test/core/object/WeakPtrTest.cc 2016-01-25 20:47:54 UTC (rev 11097)
@@ -183,7 +183,7 @@
vector.push_back(test);
vector.push_back(test);
- ASSERT_EQ(3, vector.size());
+ ASSERT_EQ(3u, vector.size());
EXPECT_EQ(test, vector[0].get());
EXPECT_EQ(test, vector[1].get());
EXPECT_EQ(test, vector[2].get());
More information about the Orxonox-commit
mailing list