COIN-OR::LEMON - Graph Library

Changes in / [1198:2236d00ca778:1196:959d78f3fe0e] in lemon-main


Ignore:
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1198 r1185  
    153153ENDIF()
    154154
    155 IF( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
    156       ("${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()
    162155
    163156IF(DEFINED ENV{LEMON_CXX_WARNING})
    164157  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
    165158ELSE()
    166   IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    167       OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    168       )
     159  IF(CMAKE_COMPILER_IS_GNUCXX)
    169160    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")
    174161    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
    175162    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
  • lemon/bfs.h

    r1197 r1092  
    13771377    struct SetReachedMapTraits : public Traits {
    13781378      typedef T ReachedMap;
    1379       static ReachedMap *createReachedMap(const Digraph &) {
     1379      static ReachedMap *createReachedMap(const Digraph &digraph) {
    13801380        LEMON_ASSERT(false, "ReachedMap is not initialized");
    13811381        return 0; // ignore warnings
  • lemon/concepts/graph_components.h

    r1197 r1092  
    104104          i1=INVALID;
    105105          _GraphItem i2 = i1;
    106           ::lemon::ignore_unused_variable_warning(i2);
    107106          _GraphItem i3 = INVALID;
    108107
     
    736735
    737736          Item bi = it1;
    738           ::lemon::ignore_unused_variable_warning(bi);
    739737          bi = it2;
    740738        }
     
    827825          ++(++it1);
    828826          Item e = it1;
    829           ::lemon::ignore_unused_variable_warning(e);
    830827          e = it2;
    831828        }
  • lemon/concepts/path.h

    r1198 r1130  
    7272      /// \brief Template copy constructor
    7373      template <typename CPath>
    74       Path(const CPath& cpath) {
    75         ::lemon::ignore_unused_variable_warning(cpath);
    76       }
     74      Path(const CPath& cpath) {}
    7775
    7876      /// \brief Template assigment operator
  • lemon/config.h.in

    r1198 r1136  
    33
    44#define LEMON_VERSION "@PROJECT_VERSION@"
    5 
    65#cmakedefine LEMON_HAVE_LONG_LONG 1
    76
     
    3029#cmakedefine LEMON_USE_WIN32_THREADS 1
    3130
    32 #cmakedefine LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS 1
    33 
    3431#endif
  • lemon/core.h

    r1197 r1135  
    3434// C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
    3535// C4996: 'function': was declared deprecated
    36 
    37 #include <lemon/config.h>
    38 
    3936#ifdef _MSC_VER
    4037#pragma warning( disable : 4250 4267 4355 4503 4800 4996 )
    4138#endif
    4239
    43 #if LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS
    44 // Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc >=4.8 and clang
     40#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
     41// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
    4542#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
    4643#endif
     
    4946#include <algorithm>
    5047
     48#include <lemon/config.h>
    5149#include <lemon/bits/enable_if.h>
    5250#include <lemon/bits/traits.h>
  • lemon/dfs.h

    r1197 r1092  
    13191319    struct SetReachedMapTraits : public Traits {
    13201320      typedef T ReachedMap;
    1321       static ReachedMap *createReachedMap(const Digraph &) {
     1321      static ReachedMap *createReachedMap(const Digraph &digraph) {
    13221322        LEMON_ASSERT(false, "ReachedMap is not initialized");
    13231323        return 0; // ignore warnings
  • lemon/nagamochi_ibaraki.h

    r1197 r1092  
    175175      typedef CR HeapCrossRef;
    176176      typedef H Heap;
    177       static HeapCrossRef *createHeapCrossRef(int) {
     177      static HeapCrossRef *createHeapCrossRef(int num) {
    178178        LEMON_ASSERT(false, "HeapCrossRef is not initialized");
    179179        return 0; // ignore warnings
  • test/adaptors_test.cc

    r1197 r1092  
    146146  // Check the conversion of nodes and arcs
    147147  Digraph::Node nd = n4;
    148   ::lemon::ignore_unused_variable_warning(nd);
    149148  nd = n4;
    150149  Adaptor::Node na = n1;
    151   ::lemon::ignore_unused_variable_warning(na);
    152150  na = n2;
    153151  Digraph::Arc ad = a4;
    154   ::lemon::ignore_unused_variable_warning(ad);
    155152  ad = a5;
    156153  Adaptor::Arc aa = a1;
    157   ::lemon::ignore_unused_variable_warning(aa);
    158154  aa = a2;
    159155}
     
    274270  // Check the conversion of nodes and arcs
    275271  Digraph::Node nd = n3;
    276   ::lemon::ignore_unused_variable_warning(nd);
    277272  nd = n3;
    278273  Adaptor::Node na = n1;
    279   ::lemon::ignore_unused_variable_warning(na);
    280274  na = n2;
    281275  Digraph::Arc ad = a3;
    282   ::lemon::ignore_unused_variable_warning(ad);
    283276  ad = a3;
    284277  Adaptor::Arc aa = a1;
    285   ::lemon::ignore_unused_variable_warning(aa);
    286278  aa = a2;
    287279}
     
    374366  // Check the conversion of nodes and arcs
    375367  Digraph::Node nd = n3;
    376   ::lemon::ignore_unused_variable_warning(nd);
    377368  nd = n3;
    378369  Adaptor::Node na = n1;
    379   ::lemon::ignore_unused_variable_warning(na);
    380370  na = n2;
    381371  Digraph::Arc ad = a3;
    382   ::lemon::ignore_unused_variable_warning(ad);
    383372  ad = a3;
    384373  Adaptor::Arc aa = a1;
    385   ::lemon::ignore_unused_variable_warning(aa);
    386374  aa = a2;
    387375}
     
    476464  // Check the conversion of nodes and arcs
    477465  Digraph::Node nd = n3;
    478   ::lemon::ignore_unused_variable_warning(nd);
    479466  nd = n3;
    480467  Adaptor::Node na = n1;
    481   ::lemon::ignore_unused_variable_warning(na);
    482468  na = n2;
    483469  Digraph::Arc ad = a3;
    484   ::lemon::ignore_unused_variable_warning(ad);
    485470  ad = a3;
    486471  Adaptor::Arc aa = a1;
    487   ::lemon::ignore_unused_variable_warning(aa);
    488472  aa = a2;
    489473}
     
    591575  // Check the conversion of nodes and arcs/edges
    592576  Digraph::Node nd = n3;
    593   ::lemon::ignore_unused_variable_warning(nd);
    594577  nd = n3;
    595578  Adaptor::Node na = n1;
    596   ::lemon::ignore_unused_variable_warning(na);
    597579  na = n2;
    598580  Digraph::Arc ad = e3;
    599   ::lemon::ignore_unused_variable_warning(ad);
    600581  ad = e3;
    601582  Adaptor::Edge ea = a1;
    602   ::lemon::ignore_unused_variable_warning(ea);
    603583  ea = a2;
    604584}
     
    755735  // Check the conversion of nodes and arcs
    756736  Digraph::Node nd = Adaptor::NodeIt(adaptor);
    757   ::lemon::ignore_unused_variable_warning(nd);
    758737  nd = ++Adaptor::NodeIt(adaptor);
    759738  Adaptor::Node na = n1;
    760   ::lemon::ignore_unused_variable_warning(na);
    761739  na = n2;
    762740  Digraph::Arc ad = Adaptor::ArcIt(adaptor);
    763   ::lemon::ignore_unused_variable_warning(ad);
    764741  ad = ++Adaptor::ArcIt(adaptor);
    765742}
     
    1011988  // Check the conversion of nodes and edges
    1012989  Graph::Node ng = n3;
    1013   ::lemon::ignore_unused_variable_warning(ng);
    1014990  ng = n4;
    1015991  Adaptor::Node na = n1;
    1016   ::lemon::ignore_unused_variable_warning(na);
    1017992  na = n2;
    1018993  Graph::Edge eg = e3;
    1019   ::lemon::ignore_unused_variable_warning(eg);
    1020994  eg = e4;
    1021995  Adaptor::Edge ea = e1;
    1022   ::lemon::ignore_unused_variable_warning(ea);
    1023996  ea = e2;
    1024997}
     
    11201093  // Check the conversion of nodes and edges
    11211094  Graph::Node ng = n3;
    1122   ::lemon::ignore_unused_variable_warning(ng);
    11231095  ng = n4;
    11241096  Adaptor::Node na = n1;
    1125   ::lemon::ignore_unused_variable_warning(na);
    11261097  na = n2;
    11271098  Graph::Edge eg = e3;
    1128   ::lemon::ignore_unused_variable_warning(eg);
    11291099  eg = e4;
    11301100  Adaptor::Edge ea = e1;
    1131   ::lemon::ignore_unused_variable_warning(ea);
    11321101  ea = e2;
    11331102}
     
    12301199  // Check the conversion of nodes and edges
    12311200  Graph::Node ng = n3;
    1232   ::lemon::ignore_unused_variable_warning(ng);
    12331201  ng = n4;
    12341202  Adaptor::Node na = n1;
    1235   ::lemon::ignore_unused_variable_warning(na);
    12361203  na = n2;
    12371204  Graph::Edge eg = e3;
    1238   ::lemon::ignore_unused_variable_warning(eg);
    12391205  eg = e4;
    12401206  Adaptor::Edge ea = e1;
    1241   ::lemon::ignore_unused_variable_warning(ea);
    12421207  ea = e2;
    12431208}
     
    13921357  // Check the conversion of nodes and arcs/edges
    13931358  Graph::Node ng = n3;
    1394   ::lemon::ignore_unused_variable_warning(ng);
    13951359  ng = n3;
    13961360  Adaptor::Node na = n1;
    1397   ::lemon::ignore_unused_variable_warning(na);
    13981361  na = n2;
    13991362  Graph::Edge eg = e3;
    1400   ::lemon::ignore_unused_variable_warning(eg);
    14011363  eg = e3;
    14021364  Adaptor::Arc aa = e1;
    1403   ::lemon::ignore_unused_variable_warning(aa);
    14041365  aa = e2;
    14051366}
Note: See TracChangeset for help on using the changeset viewer.