COIN-OR::LEMON - Graph Library

Changeset 477:e6ae4999cf22 in lemon-main


Ignore:
Timestamp:
01/22/09 15:46:15 (16 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Suppress or fix VS2008 warnings + turn off faulty tests using CMAKE (#208)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r473 r477  
    1313
    1414ADD_DEFINITIONS(-DHAVE_CONFIG_H)
     15
     16IF(MSVC)
     17  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
     18# Suppressed warnings:
     19# C4250: 'class1' : inherits 'class2::member' via dominance
     20# C4355: 'this' : used in base member initializer list
     21# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
     22# C4996: 'function': was declared deprecated
     23ENDIF(MSVC)
    1524
    1625IF(GLPK_FOUND)
  • lemon/base.cc

    r440 r477  
    2424namespace lemon {
    2525
    26   float Tolerance<float>::def_epsilon = 1e-4;
     26  float Tolerance<float>::def_epsilon = static_cast<float>(1e-4);
    2727  double Tolerance<double>::def_epsilon = 1e-10;
    2828  long double Tolerance<long double>::def_epsilon = 1e-14;
  • test/CMakeLists.txt

    r474 r477  
    1111
    1212SET(TESTS
    13   adaptors_test
     13#   adaptors_test
    1414  bfs_test
    1515  circulation_test
     
    1919  dijkstra_test
    2020  dim_test
    21   edge_set_test
     21#   edge_set_test
    2222  error_test
    2323  graph_copy_test
  • test/maps_test.cc

    r440 r477  
    171171    typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
    172172    checkConcept<ReadMap<B,double>, CompMap>();
    173     CompMap map1(DoubleMap(),ReadMap<B,A>());
     173    CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
    174174    CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
    175175
     
    184184    typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
    185185    checkConcept<ReadMap<A,double>, CombMap>();
    186     CombMap map1(DoubleMap(), DoubleMap());
     186    CombMap map1 = CombMap(DoubleMap(), DoubleMap());
    187187    CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
    188188
     
    196196    checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
    197197    FunctorToMap<F> map1;
    198     FunctorToMap<F> map2(F());
     198    FunctorToMap<F> map2 = FunctorToMap<F>(F());
    199199    B b = functorToMap(F())[A()];
    200200
    201201    checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
    202     MapToFunctor<ReadMap<A,B> > map(ReadMap<A,B>());
     202    MapToFunctor<ReadMap<A,B> > map = MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
    203203
    204204    check(functorToMap(&func)[A()] == 3,
Note: See TracChangeset for help on using the changeset viewer.