gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Suppress or fix VS2008 warnings + turn off faulty tests using CMAKE (#208)
0 4 0
default
4 files changed with 16 insertions and 7 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -13,6 +13,15 @@
13 13

	
14 14
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
15 15

	
16
IF(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
23
ENDIF(MSVC)
24

	
16 25
IF(GLPK_FOUND)
17 26
  SET(HAVE_LP TRUE)
18 27
  SET(HAVE_MIP TRUE)
Ignore white space 6 line context
... ...
@@ -23,7 +23,7 @@
23 23
#include<lemon/core.h>
24 24
namespace lemon {
25 25

	
26
  float Tolerance<float>::def_epsilon = 1e-4;
26
  float Tolerance<float>::def_epsilon = static_cast<float>(1e-4);
27 27
  double Tolerance<double>::def_epsilon = 1e-10;
28 28
  long double Tolerance<long double>::def_epsilon = 1e-14;
29 29

	
Ignore white space 6 line context
... ...
@@ -10,7 +10,7 @@
10 10
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
11 11

	
12 12
SET(TESTS
13
  adaptors_test
13
#   adaptors_test
14 14
  bfs_test
15 15
  circulation_test
16 16
  counter_test
... ...
@@ -18,7 +18,7 @@
18 18
  digraph_test
19 19
  dijkstra_test
20 20
  dim_test
21
  edge_set_test
21
#   edge_set_test
22 22
  error_test
23 23
  graph_copy_test
24 24
  graph_test
Ignore white space 6 line context
... ...
@@ -170,7 +170,7 @@
170 170
  {
171 171
    typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
172 172
    checkConcept<ReadMap<B,double>, CompMap>();
173
    CompMap map1(DoubleMap(),ReadMap<B,A>());
173
    CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
174 174
    CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
175 175

	
176 176
    SparseMap<double, bool> m1(false); m1[3.14] = true;
... ...
@@ -183,7 +183,7 @@
183 183
  {
184 184
    typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
185 185
    checkConcept<ReadMap<A,double>, CombMap>();
186
    CombMap map1(DoubleMap(), DoubleMap());
186
    CombMap map1 = CombMap(DoubleMap(), DoubleMap());
187 187
    CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
188 188

	
189 189
    check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
... ...
@@ -195,11 +195,11 @@
195 195
    checkConcept<ReadMap<A,B>, FunctorToMap<F,A,B> >();
196 196
    checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
197 197
    FunctorToMap<F> map1;
198
    FunctorToMap<F> map2(F());
198
    FunctorToMap<F> map2 = FunctorToMap<F>(F());
199 199
    B b = functorToMap(F())[A()];
200 200

	
201 201
    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>());
203 203

	
204 204
    check(functorToMap(&func)[A()] == 3,
205 205
          "Something is wrong with FunctorToMap");
0 comments (0 inline)