COIN-OR::LEMON - Graph Library

Changeset 357:2b6a20528f35 in lemon-1.0


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

Backport [e6ae4999cf22] from main (Suppress or fix VS2008 warnings) (#208)

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r274 r357  
    77
    88SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
     9
     10IF(MSVC)
     11  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
     12# Suppressed warnings:
     13# C4250: 'class1' : inherits 'class2::member' via dominance
     14# C4355: 'this' : used in base member initializer list
     15# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
     16# C4996: 'function': was declared deprecated
     17ENDIF(MSVC)
    918
    1019INCLUDE(FindDoxygen)
  • lemon/base.cc

    r220 r357  
    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/maps_test.cc

    r210 r357  
    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.