r500:2b6a20528f35
Thu, 22 Jan 2009 16:15:51
[Not Reviewed]
0 comments (0 inline)
0
3
0
| ... | ... |
@@ -6,8 +6,17 @@ |
| 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() |
| ... | ... |
@@ -22,9 +22,9 @@ |
| 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 |
| ... | ... |
@@ -169,9 +169,9 @@ |
| 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; |
| ... | ... |
@@ -182,9 +182,9 @@ |
| 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"); |
| ... | ... |
@@ -194,13 +194,13 @@ |
| 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, |
0 comments (0 inline)