gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Backport [e6ae4999cf22] from main (Suppress or fix VS2008 warnings) (#208)
0 3 0
1.0
3 files changed with 14 insertions and 5 deletions:
↑ Collapse diff ↑
Show white space 6 line context
... ...
@@ -9,2 +9,11 @@
9 9

	
10
IF(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
17
ENDIF(MSVC)
18

	
10 19
INCLUDE(FindDoxygen)
Ignore white space 6 line context
... ...
@@ -25,3 +25,3 @@
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;
Ignore white space 6 line context
... ...
@@ -172,3 +172,3 @@
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>());
... ...
@@ -185,3 +185,3 @@
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>());
... ...
@@ -197,3 +197,3 @@
197 197
    FunctorToMap<F> map1;
198
    FunctorToMap<F> map2(F());
198
    FunctorToMap<F> map2 = FunctorToMap<F>(F());
199 199
    B b = functorToMap(F())[A()];
... ...
@@ -201,3 +201,3 @@
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

	
0 comments (0 inline)