Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11097


Ignore:
Timestamp:
Jan 25, 2016, 9:47:54 PM (8 years ago)
Author:
landauf
Message:

fixed build on tardis.

Location:
code/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/LibraryConfig.cmake

    r10258 r11097  
    162162                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
    163163                              1.53.0)
    164 IF(NOT TARDIS)
    165   FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
    166 ENDIF()
     164FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
    167165# No auto linking, so this option is useless anyway
    168166MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
  • code/trunk/cmake/LibraryConfigTardis.cmake

    r11016 r11097  
    4040#  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
    4141
    42   # Note: When setting ENV${} variables, make sure to use quotes when
    43   #       having multiple directories.
    44   #SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.42.0-bs/include")
    45   #SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.42.0-bs/i686-debian-linux4.0/lib")
    46   SET(Boost_VERSION 104200)
    47   SET(Boost_INCLUDE_DIRS "/usr/pack/boost-1.42.0-bs/include" CACHE PATH "")
    48   SET(Boost_SYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_system.so" CACHE PATH "")
    49   SET(Boost_SYSTEM_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_system-d.so" CACHE PATH "")
    50   SET(Boost_DATE_TIME_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_date_time.so" CACHE PATH "")
    51   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 "")
    52   SET(Boost_FILESYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_filesystem.so" CACHE PATH "")
    53   SET(Boost_FILESYSTEM_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_filesystem-d.so" CACHE PATH "")
    54   SET(Boost_THREAD_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_thread-mt.so" CACHE PATH "")
    55   SET(Boost_THREAD_LIBRARY_DEBUG "/usr/pack/boost-1.42.0-bs/amd64-debian-linux5.0/lib/libboost_thread-mt-d.so" CACHE PATH "")
    56 
    57   SET(Boost_SYSTEM_LIBRARY "debug;${Boost_SYSTEM_LIBRARY_DEBUG};optimized;${Boost_SYSTEM_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
    58   SET(Boost_DATE_TIME_LIBRARY "debug;${Boost_DATE_TIME_LIBRARY_DEBUG};optimized;${Boost_DATE_TIME_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
    59   SET(Boost_FILESYSTEM_LIBRARY "debug;${Boost_FILESYSTEM_LIBRARY_DEBUG};optimized;${Boost_FILESYSTEM_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
    60   SET(Boost_THREAD_LIBRARY "debug;${Boost_THREAD_LIBRARY_DEBUG};optimized;${Boost_THREAD_LIBRARY_RELEASE}" CACHE PATH "" FORCE)
    61 
    62   MARK_AS_ADVANCED( Boost_INCLUDE_DIRS )
    63   MARK_AS_ADVANCED( Boost_SYSTEM_LIBRARY Boost_SYSTEM_LIBRARY_RELEASE Boost_SYSTEM_LIBRARY_DEBUG )
    64   MARK_AS_ADVANCED( Boost_DATE_TIME_LIBRARY Boost_DATE_TIME_LIBRARY_RELEASE Boost_DATE_TIME_LIBRARY_DEBUG )
    65   MARK_AS_ADVANCED( Boost_FILESYSTEM_LIBRARY Boost_FILESYSTEM_LIBRARY_RELEASE Boost_FILESYSTEM_LIBRARY_DEBUG )
    66   MARK_AS_ADVANCED( Boost_THREAD_LIBRARY Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_DEBUG )
    67 
    68 
    6942  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
    7043  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
  • code/trunk/src/libraries/util/StringUtils.cc

    r11071 r11097  
    3636#include <cctype>
    3737#include <ctime>
     38#include <memory>
    3839#include "Convert.h"
    3940#include "Math.h"
  • code/trunk/test/core/command/FunctorTest.cc

    r11071 r11097  
    9898    TEST_F(FunctorTest, ReturnsCorrectParamCount)
    9999    {
    100         EXPECT_EQ(0, createFunctor(&DestroyableClass::method0)->getParamCount());
    101         EXPECT_EQ(1, createFunctor(&DestroyableClass::method1)->getParamCount());
    102         EXPECT_EQ(2, createFunctor(&DestroyableClass::method2)->getParamCount());
    103         EXPECT_EQ(3, createFunctor(&DestroyableClass::method3)->getParamCount());
    104         EXPECT_EQ(4, createFunctor(&DestroyableClass::method4)->getParamCount());
    105         EXPECT_EQ(5, createFunctor(&DestroyableClass::method5)->getParamCount());
     100        EXPECT_EQ(0u, createFunctor(&DestroyableClass::method0)->getParamCount());
     101        EXPECT_EQ(1u, createFunctor(&DestroyableClass::method1)->getParamCount());
     102        EXPECT_EQ(2u, createFunctor(&DestroyableClass::method2)->getParamCount());
     103        EXPECT_EQ(3u, createFunctor(&DestroyableClass::method3)->getParamCount());
     104        EXPECT_EQ(4u, createFunctor(&DestroyableClass::method4)->getParamCount());
     105        EXPECT_EQ(5u, createFunctor(&DestroyableClass::method5)->getParamCount());
    106106    }
    107107
     
    663663        EXPECT_EQ(8,  (*c8)(4).get<int>());
    664664
    665         EXPECT_EQ(1, c1->getParamCount());
    666         EXPECT_EQ(1, c2->getParamCount());
    667         EXPECT_EQ(1, c3->getParamCount());
    668         EXPECT_EQ(2, c4->getParamCount());
    669         EXPECT_EQ(0, c5->getParamCount());
    670         EXPECT_EQ(1, c6->getParamCount());
    671         EXPECT_EQ(2, c7->getParamCount());
    672         EXPECT_EQ(1, c8->getParamCount());
     665        EXPECT_EQ(1u, c1->getParamCount());
     666        EXPECT_EQ(1u, c2->getParamCount());
     667        EXPECT_EQ(1u, c3->getParamCount());
     668        EXPECT_EQ(2u, c4->getParamCount());
     669        EXPECT_EQ(0u, c5->getParamCount());
     670        EXPECT_EQ(1u, c6->getParamCount());
     671        EXPECT_EQ(2u, c7->getParamCount());
     672        EXPECT_EQ(1u, c8->getParamCount());
    673673
    674674        EXPECT_EQ(typeid(int(*)(int)), c1->getFullIdentifier());
     
    768768        FunctorPtr fp2 = createFunctor(&f2);
    769769        FunctorPtr fp3 = createFunctor(&f3);
    770         ASSERT_EQ(3, fp2->getParamCount());
     770        ASSERT_EQ(3u, fp2->getParamCount());
    771771        ASSERT_NE(fp1->getParamCount(), fp3->getParamCount());
    772772        ASSERT_FALSE(fp2->hasReturnvalue());
  • code/trunk/test/core/object/ObjectListTest.cc

    r11071 r11097  
    114114        ListableTest test3(&context2);
    115115
    116         EXPECT_EQ(3, ObjectList<ListableTest>().size());
    117         EXPECT_EQ(2, ObjectList<ListableTest>(&context1).size());
    118         EXPECT_EQ(1, ObjectList<ListableTest>(&context2).size());
     116        EXPECT_EQ(3u, ObjectList<ListableTest>().size());
     117        EXPECT_EQ(2u, ObjectList<ListableTest>(&context1).size());
     118        EXPECT_EQ(1u, ObjectList<ListableTest>(&context2).size());
    119119    }
    120120
  • code/trunk/test/core/object/StrongPtrTest.cc

    r11071 r11097  
    257257        vector.push_back(test);
    258258
    259         ASSERT_EQ(3, vector.size());
     259        ASSERT_EQ(3u, vector.size());
    260260        EXPECT_EQ(test, vector[0].get());
    261261        EXPECT_EQ(test, vector[1].get());
  • code/trunk/test/core/object/WeakPtrTest.cc

    r11071 r11097  
    184184        vector.push_back(test);
    185185
    186         ASSERT_EQ(3, vector.size());
     186        ASSERT_EQ(3u, vector.size());
    187187        EXPECT_EQ(test, vector[0].get());
    188188        EXPECT_EQ(test, vector[1].get());
Note: See TracChangeset for help on using the changeset viewer.