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 ↑
Ignore white space 6 line context
1 1
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
2 2

	
3 3
SET(PROJECT_NAME "LEMON")
4 4
SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.")
5 5

	
6 6
PROJECT(${PROJECT_NAME})
7 7

	
8 8
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
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)
11 20
INCLUDE(FindGhostscript)
12 21

	
13 22
ENABLE_TESTING()
14 23

	
15 24
ADD_SUBDIRECTORY(lemon)
16 25
ADD_SUBDIRECTORY(demo)
17 26
ADD_SUBDIRECTORY(doc)
18 27
ADD_SUBDIRECTORY(test)
19 28

	
20 29
IF(WIN32)
21 30
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico
22 31
    DESTINATION bin)
23 32
ENDIF(WIN32)
24 33

	
25 34
IF(WIN32)
Ignore white space 32 line context
... ...
@@ -10,25 +10,25 @@
10 10
 * provided that this copyright notice appears in all copies. For
11 11
 * precise terms see the accompanying LICENSE file.
12 12
 *
13 13
 * This software is provided "AS IS" with no warranty of any kind,
14 14
 * express or implied, and with no claim as to its suitability for any
15 15
 * purpose.
16 16
 *
17 17
 */
18 18

	
19 19
///\file
20 20
///\brief Some basic non-inline functions and static global data.
21 21

	
22 22
#include<lemon/tolerance.h>
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

	
30 30
#ifndef LEMON_ONLY_TEMPLATES
31 31
  const Invalid INVALID = Invalid();
32 32
#endif
33 33

	
34 34
} //namespace lemon
Ignore white space 6 line context
... ...
@@ -157,62 +157,62 @@
157 157
    SparseMap<double, int> map7 = sparseMap(m);
158 158
    SparseMap<double, int> map8 = sparseMap(m,10);
159 159

	
160 160
    check(map5[1.0] == 0 && map5[3.14] == 0 &&
161 161
          map6[1.0] == 10 && map6[3.14] == 10,
162 162
          "Something is wrong with SparseMap");
163 163
    map5[1.0] = map6[3.14] = 100;
164 164
    check(map5[1.0] == 100 && map5[3.14] == 0 &&
165 165
          map6[1.0] == 10 && map6[3.14] == 100,
166 166
          "Something is wrong with SparseMap");
167 167
  }
168 168

	
169 169
  // ComposeMap
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;
177 177
    RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
178 178
    check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1],
179 179
          "Something is wrong with ComposeMap")
180 180
  }
181 181

	
182 182
  // CombineMap
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,
190 190
          "Something is wrong with CombineMap");
191 191
  }
192 192

	
193 193
  // FunctorToMap, MapToFunctor
194 194
  {
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");
206 206
    check(mapToFunctor(constMap<A,int>(2))(A()) == 2,
207 207
          "Something is wrong with MapToFunctor");
208 208
    check(mapToFunctor(functorToMap(&func))(A()) == 3 &&
209 209
          mapToFunctor(functorToMap(&func))[A()] == 3,
210 210
          "Something is wrong with FunctorToMap or MapToFunctor");
211 211
    check(functorToMap(mapToFunctor(constMap<A,int>(2)))[A()] == 2,
212 212
          "Something is wrong with FunctorToMap or MapToFunctor");
213 213
  }
214 214

	
215 215
  // ConvertMap
216 216
  {
217 217
    checkConcept<ReadMap<double,double>,
218 218
      ConvertMap<ReadMap<double, int>, double> >();
0 comments (0 inline)