Changes in / [1198:2236d00ca778:1196:959d78f3fe0e] in lemon-main
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r1198 r1185 153 153 ENDIF() 154 154 155 IF( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND156 ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL "4.8") )157 OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")158 OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")159 )160 SET(LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS TRUE)161 ENDIF()162 155 163 156 IF(DEFINED ENV{LEMON_CXX_WARNING}) 164 157 SET(CXX_WARNING $ENV{LEMON_CXX_WARNING}) 165 158 ELSE() 166 IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") 167 OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 168 ) 159 IF(CMAKE_COMPILER_IS_GNUCXX) 169 160 SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas") 170 SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")171 SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")172 ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")173 SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wno-unknown-pragmas")174 161 SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb") 175 162 SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb") -
lemon/bfs.h
r1197 r1092 1377 1377 struct SetReachedMapTraits : public Traits { 1378 1378 typedef T ReachedMap; 1379 static ReachedMap *createReachedMap(const Digraph & ) {1379 static ReachedMap *createReachedMap(const Digraph &digraph) { 1380 1380 LEMON_ASSERT(false, "ReachedMap is not initialized"); 1381 1381 return 0; // ignore warnings -
lemon/concepts/graph_components.h
r1197 r1092 104 104 i1=INVALID; 105 105 _GraphItem i2 = i1; 106 ::lemon::ignore_unused_variable_warning(i2);107 106 _GraphItem i3 = INVALID; 108 107 … … 736 735 737 736 Item bi = it1; 738 ::lemon::ignore_unused_variable_warning(bi);739 737 bi = it2; 740 738 } … … 827 825 ++(++it1); 828 826 Item e = it1; 829 ::lemon::ignore_unused_variable_warning(e);830 827 e = it2; 831 828 } -
lemon/concepts/path.h
r1198 r1130 72 72 /// \brief Template copy constructor 73 73 template <typename CPath> 74 Path(const CPath& cpath) { 75 ::lemon::ignore_unused_variable_warning(cpath); 76 } 74 Path(const CPath& cpath) {} 77 75 78 76 /// \brief Template assigment operator -
lemon/config.h.in
r1198 r1136 3 3 4 4 #define LEMON_VERSION "@PROJECT_VERSION@" 5 6 5 #cmakedefine LEMON_HAVE_LONG_LONG 1 7 6 … … 30 29 #cmakedefine LEMON_USE_WIN32_THREADS 1 31 30 32 #cmakedefine LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS 133 34 31 #endif -
lemon/core.h
r1197 r1135 34 34 // C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) 35 35 // C4996: 'function': was declared deprecated 36 37 #include <lemon/config.h>38 39 36 #ifdef _MSC_VER 40 37 #pragma warning( disable : 4250 4267 4355 4503 4800 4996 ) 41 38 #endif 42 39 43 #if LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS44 // Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc >=4.8 and clang40 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) 41 // Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8 45 42 #pragma GCC diagnostic ignored "-Wunused-local-typedefs" 46 43 #endif … … 49 46 #include <algorithm> 50 47 48 #include <lemon/config.h> 51 49 #include <lemon/bits/enable_if.h> 52 50 #include <lemon/bits/traits.h> -
lemon/dfs.h
r1197 r1092 1319 1319 struct SetReachedMapTraits : public Traits { 1320 1320 typedef T ReachedMap; 1321 static ReachedMap *createReachedMap(const Digraph & ) {1321 static ReachedMap *createReachedMap(const Digraph &digraph) { 1322 1322 LEMON_ASSERT(false, "ReachedMap is not initialized"); 1323 1323 return 0; // ignore warnings -
lemon/nagamochi_ibaraki.h
r1197 r1092 175 175 typedef CR HeapCrossRef; 176 176 typedef H Heap; 177 static HeapCrossRef *createHeapCrossRef(int ) {177 static HeapCrossRef *createHeapCrossRef(int num) { 178 178 LEMON_ASSERT(false, "HeapCrossRef is not initialized"); 179 179 return 0; // ignore warnings -
test/adaptors_test.cc
r1197 r1092 146 146 // Check the conversion of nodes and arcs 147 147 Digraph::Node nd = n4; 148 ::lemon::ignore_unused_variable_warning(nd);149 148 nd = n4; 150 149 Adaptor::Node na = n1; 151 ::lemon::ignore_unused_variable_warning(na);152 150 na = n2; 153 151 Digraph::Arc ad = a4; 154 ::lemon::ignore_unused_variable_warning(ad);155 152 ad = a5; 156 153 Adaptor::Arc aa = a1; 157 ::lemon::ignore_unused_variable_warning(aa);158 154 aa = a2; 159 155 } … … 274 270 // Check the conversion of nodes and arcs 275 271 Digraph::Node nd = n3; 276 ::lemon::ignore_unused_variable_warning(nd);277 272 nd = n3; 278 273 Adaptor::Node na = n1; 279 ::lemon::ignore_unused_variable_warning(na);280 274 na = n2; 281 275 Digraph::Arc ad = a3; 282 ::lemon::ignore_unused_variable_warning(ad);283 276 ad = a3; 284 277 Adaptor::Arc aa = a1; 285 ::lemon::ignore_unused_variable_warning(aa);286 278 aa = a2; 287 279 } … … 374 366 // Check the conversion of nodes and arcs 375 367 Digraph::Node nd = n3; 376 ::lemon::ignore_unused_variable_warning(nd);377 368 nd = n3; 378 369 Adaptor::Node na = n1; 379 ::lemon::ignore_unused_variable_warning(na);380 370 na = n2; 381 371 Digraph::Arc ad = a3; 382 ::lemon::ignore_unused_variable_warning(ad);383 372 ad = a3; 384 373 Adaptor::Arc aa = a1; 385 ::lemon::ignore_unused_variable_warning(aa);386 374 aa = a2; 387 375 } … … 476 464 // Check the conversion of nodes and arcs 477 465 Digraph::Node nd = n3; 478 ::lemon::ignore_unused_variable_warning(nd);479 466 nd = n3; 480 467 Adaptor::Node na = n1; 481 ::lemon::ignore_unused_variable_warning(na);482 468 na = n2; 483 469 Digraph::Arc ad = a3; 484 ::lemon::ignore_unused_variable_warning(ad);485 470 ad = a3; 486 471 Adaptor::Arc aa = a1; 487 ::lemon::ignore_unused_variable_warning(aa);488 472 aa = a2; 489 473 } … … 591 575 // Check the conversion of nodes and arcs/edges 592 576 Digraph::Node nd = n3; 593 ::lemon::ignore_unused_variable_warning(nd);594 577 nd = n3; 595 578 Adaptor::Node na = n1; 596 ::lemon::ignore_unused_variable_warning(na);597 579 na = n2; 598 580 Digraph::Arc ad = e3; 599 ::lemon::ignore_unused_variable_warning(ad);600 581 ad = e3; 601 582 Adaptor::Edge ea = a1; 602 ::lemon::ignore_unused_variable_warning(ea);603 583 ea = a2; 604 584 } … … 755 735 // Check the conversion of nodes and arcs 756 736 Digraph::Node nd = Adaptor::NodeIt(adaptor); 757 ::lemon::ignore_unused_variable_warning(nd);758 737 nd = ++Adaptor::NodeIt(adaptor); 759 738 Adaptor::Node na = n1; 760 ::lemon::ignore_unused_variable_warning(na);761 739 na = n2; 762 740 Digraph::Arc ad = Adaptor::ArcIt(adaptor); 763 ::lemon::ignore_unused_variable_warning(ad);764 741 ad = ++Adaptor::ArcIt(adaptor); 765 742 } … … 1011 988 // Check the conversion of nodes and edges 1012 989 Graph::Node ng = n3; 1013 ::lemon::ignore_unused_variable_warning(ng);1014 990 ng = n4; 1015 991 Adaptor::Node na = n1; 1016 ::lemon::ignore_unused_variable_warning(na);1017 992 na = n2; 1018 993 Graph::Edge eg = e3; 1019 ::lemon::ignore_unused_variable_warning(eg);1020 994 eg = e4; 1021 995 Adaptor::Edge ea = e1; 1022 ::lemon::ignore_unused_variable_warning(ea);1023 996 ea = e2; 1024 997 } … … 1120 1093 // Check the conversion of nodes and edges 1121 1094 Graph::Node ng = n3; 1122 ::lemon::ignore_unused_variable_warning(ng);1123 1095 ng = n4; 1124 1096 Adaptor::Node na = n1; 1125 ::lemon::ignore_unused_variable_warning(na);1126 1097 na = n2; 1127 1098 Graph::Edge eg = e3; 1128 ::lemon::ignore_unused_variable_warning(eg);1129 1099 eg = e4; 1130 1100 Adaptor::Edge ea = e1; 1131 ::lemon::ignore_unused_variable_warning(ea);1132 1101 ea = e2; 1133 1102 } … … 1230 1199 // Check the conversion of nodes and edges 1231 1200 Graph::Node ng = n3; 1232 ::lemon::ignore_unused_variable_warning(ng);1233 1201 ng = n4; 1234 1202 Adaptor::Node na = n1; 1235 ::lemon::ignore_unused_variable_warning(na);1236 1203 na = n2; 1237 1204 Graph::Edge eg = e3; 1238 ::lemon::ignore_unused_variable_warning(eg);1239 1205 eg = e4; 1240 1206 Adaptor::Edge ea = e1; 1241 ::lemon::ignore_unused_variable_warning(ea);1242 1207 ea = e2; 1243 1208 } … … 1392 1357 // Check the conversion of nodes and arcs/edges 1393 1358 Graph::Node ng = n3; 1394 ::lemon::ignore_unused_variable_warning(ng);1395 1359 ng = n3; 1396 1360 Adaptor::Node na = n1; 1397 ::lemon::ignore_unused_variable_warning(na);1398 1361 na = n2; 1399 1362 Graph::Edge eg = e3; 1400 ::lemon::ignore_unused_variable_warning(eg);1401 1363 eg = e3; 1402 1364 Adaptor::Arc aa = e1; 1403 ::lemon::ignore_unused_variable_warning(aa);1404 1365 aa = e2; 1405 1366 }
Note: See TracChangeset
for help on using the changeset viewer.