COIN-OR::LEMON - Graph Library

Changeset 1417:2236d00ca778 in lemon


Ignore:
Timestamp:
11/01/18 19:49:51 (7 weeks ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1415:959d78f3fe0e (diff), 1416:f179aa1045a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge #615

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1404 r1417  
    153153ENDIF()
    154154
     155IF( ( ("${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)
     161ENDIF()
    155162
    156163IF(DEFINED ENV{LEMON_CXX_WARNING})
    157164  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
    158165ELSE()
    159   IF(CMAKE_COMPILER_IS_GNUCXX)
     166  IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     167      OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     168      )
    160169    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")
    161174    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
    162175    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
  • CMakeLists.txt

    r1416 r1417  
    44  CMAKE_POLICY(SET CMP0048 OLD)
    55ENDIF(POLICY CMP0048)
     6
     7IF(POLICY CMP0043)
     8  CMAKE_POLICY(SET CMP0043 OLD)
     9ENDIF(POLICY CMP0043)
    610
    711IF(POLICY CMP0026)
     
    247251    FORCE )
    248252
     253SET_DIRECTORY_PROPERTIES(PROPERTIES
     254  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
     255  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
     256)
    249257
    250258INCLUDE(CheckTypeSize)
     
    275283
    276284ENABLE_TESTING()
     285
     286
     287INCLUDE(CheckCXXCompilerFlag)
     288CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
     289IF(LEMON_CXX11)
     290  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     291ENDIF()
     292
    277293
    278294IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
  • lemon/concepts/path.h

    r1336 r1417  
    7272      /// \brief Template copy constructor
    7373      template <typename CPath>
    74       Path(const CPath& cpath) {}
     74      Path(const CPath& cpath) {
     75        ::lemon::ignore_unused_variable_warning(cpath);
     76      }
    7577
    7678      /// \brief Template assigment operator
  • lemon/concepts/path.h

    r1416 r1417  
    2727#include <lemon/core.h>
    2828#include <lemon/concept_check.h>
     29#include <lemon/bits/stl_iterators.h>
    2930
    3031namespace lemon {
     
    118119      };
    119120
     121      /// \brief Gets the collection of the arcs of the path.
     122      ///
     123      /// This function can be used for iterating on the
     124      /// arcs of the path. It returns a wrapped
     125      /// ArcIt, which looks like an STL container
     126      /// (by having begin() and end()) which you can use in range-based
     127      /// for loops, STL algorithms, etc.
     128      /// For example you can write:
     129      ///\code
     130      /// for(auto a: p.arcs())
     131      ///   doSomething(a);
     132      ///\endcode
     133      LemonRangeWrapper1<ArcIt, Path> arcs() const {
     134        return LemonRangeWrapper1<ArcIt, Path>(*this);
     135      }
     136
     137
    120138      template <typename _Path>
    121139      struct Constraints {
     
    266284
    267285      };
     286
     287      /// \brief Gets the collection of the arcs of the path.
     288      ///
     289      /// This function can be used for iterating on the
     290      /// arcs of the path. It returns a wrapped
     291      /// ArcIt, which looks like an STL container
     292      /// (by having begin() and end()) which you can use in range-based
     293      /// for loops, STL algorithms, etc.
     294      /// For example you can write:
     295      ///\code
     296      /// for(auto a: p.arcs())
     297      ///   doSomething(a);
     298      ///\endcode
     299      LemonRangeWrapper1<ArcIt, PathDumper> arcs() const {
     300        return LemonRangeWrapper1<ArcIt, PathDumper>(*this);
     301      }
     302
    268303
    269304      /// \brief LEMON style iterator for enumerating the arcs of a path
     
    296331      };
    297332
     333      /// \brief Gets the collection of the arcs of the path
     334      /// in reverse direction.
     335      ///
     336      /// This function can be used for iterating on the
     337      /// arcs of the path in reverse direction. It returns a wrapped
     338      /// RevArcIt, which looks like an STL container
     339      /// (by having begin() and end()) which you can use in range-based
     340      /// for loops, STL algorithms, etc.
     341      /// For example you can write:
     342      ///\code
     343      /// for(auto a: p.revArcs())
     344      ///   doSomething(a);
     345      ///\endcode
     346      LemonRangeWrapper1<RevArcIt, PathDumper> revArcs() const {
     347        return LemonRangeWrapper1<RevArcIt, PathDumper>(*this);
     348      }
     349
     350
    298351      template <typename _Path>
    299352      struct Constraints {
  • lemon/config.h.in

    r1343 r1417  
    33
    44#define LEMON_VERSION "@PROJECT_VERSION@"
     5
    56#cmakedefine LEMON_HAVE_LONG_LONG 1
    67
     
    2930#cmakedefine LEMON_USE_WIN32_THREADS 1
    3031
     32#cmakedefine LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS 1
     33
    3134#endif
  • lemon/config.h.in

    r1416 r1417  
    55
    66#cmakedefine LEMON_HAVE_LONG_LONG 1
     7
     8#cmakedefine LEMON_CXX11 1
    79
    810#cmakedefine LEMON_WIN32 1
Note: See TracChangeset for help on using the changeset viewer.