Changeset 1198:2236d00ca778 in lemon-main

Timestamp:

11/01/18 19:49:51 (6 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

1196:959d78f3fe0e (diff), 1197: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:

• CMakeLists.txt (modified) (1 diff)
• CMakeLists.txt (modified) (3 diffs)
• lemon/concepts/path.h (modified) (1 diff)
• lemon/concepts/path.h (modified) (4 diffs)
• lemon/config.h.in (modified) (2 diffs)
• lemon/config.h.in (modified) (1 diff)

CMakeLists.txt

@@ -153 +153 @@
 ENDIF()
 
+IF( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
+      ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL "4.8") )
+    OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    )
+  SET(LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS TRUE)
+ENDIF()
 
 IF(DEFINED ENV{LEMON_CXX_WARNING})
   SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
 ELSE()
-  IF(CMAKE_COMPILER_IS_GNUCXX)
+  IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+      OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      )
     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")
+    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
+    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
+  ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    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")
     SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
     SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")

CMakeLists.txt

@@ -4 +4 @@
   CMAKE_POLICY(SET CMP0048 OLD) 
 ENDIF(POLICY CMP0048)
+
+IF(POLICY CMP0043) 
+  CMAKE_POLICY(SET CMP0043 OLD) 
+ENDIF(POLICY CMP0043)
 
 IF(POLICY CMP0026)
@@ -247 +251 @@
     FORCE )
 
+SET_DIRECTORY_PROPERTIES(PROPERTIES
+  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
+  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
+)
 
 INCLUDE(CheckTypeSize)
@@ -275 +283 @@
 
 ENABLE_TESTING()
+
+
+INCLUDE(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
+IF(LEMON_CXX11)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ENDIF()
+
 
 IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")

lemon/concepts/path.h

@@ -72 +72 @@
       /// \brief Template copy constructor
       template <typename CPath>
-      Path(const CPath& cpath) {}
+      Path(const CPath& cpath) {
+        ::lemon::ignore_unused_variable_warning(cpath);
+      }
 
       /// \brief Template assigment operator

lemon/concepts/path.h

@@ -27 +27 @@
 #include <lemon/core.h>
 #include <lemon/concept_check.h>
+#include <lemon/bits/stl_iterators.h>
 
 namespace lemon {
@@ -118 +119 @@
       };
 
+      /// \brief Gets the collection of the arcs of the path.
+      ///
+      /// This function can be used for iterating on the
+      /// arcs of the path. It returns a wrapped
+      /// ArcIt, which looks like an STL container
+      /// (by having begin() and end()) which you can use in range-based
+      /// for loops, STL algorithms, etc.
+      /// For example you can write:
+      ///\code
+      /// for(auto a: p.arcs())
+      ///   doSomething(a);
+      ///\endcode
+      LemonRangeWrapper1<ArcIt, Path> arcs() const {
+        return LemonRangeWrapper1<ArcIt, Path>(*this);
+      }
+
+
       template <typename _Path>
       struct Constraints {
@@ -266 +284 @@
 
       };
+
+      /// \brief Gets the collection of the arcs of the path.
+      ///
+      /// This function can be used for iterating on the
+      /// arcs of the path. It returns a wrapped
+      /// ArcIt, which looks like an STL container
+      /// (by having begin() and end()) which you can use in range-based
+      /// for loops, STL algorithms, etc.
+      /// For example you can write:
+      ///\code
+      /// for(auto a: p.arcs())
+      ///   doSomething(a);
+      ///\endcode
+      LemonRangeWrapper1<ArcIt, PathDumper> arcs() const {
+        return LemonRangeWrapper1<ArcIt, PathDumper>(*this);
+      }
+
 
       /// \brief LEMON style iterator for enumerating the arcs of a path
@@ -296 +331 @@
       };
 
+      /// \brief Gets the collection of the arcs of the path
+      /// in reverse direction.
+      ///
+      /// This function can be used for iterating on the
+      /// arcs of the path in reverse direction. It returns a wrapped
+      /// RevArcIt, which looks like an STL container
+      /// (by having begin() and end()) which you can use in range-based
+      /// for loops, STL algorithms, etc.
+      /// For example you can write:
+      ///\code
+      /// for(auto a: p.revArcs())
+      ///   doSomething(a);
+      ///\endcode
+      LemonRangeWrapper1<RevArcIt, PathDumper> revArcs() const {
+        return LemonRangeWrapper1<RevArcIt, PathDumper>(*this);
+      }
+
+
       template <typename _Path>
       struct Constraints {

lemon/config.h.in

@@ -3 +3 @@
 
 #define LEMON_VERSION "@PROJECT_VERSION@"
+
 #cmakedefine LEMON_HAVE_LONG_LONG 1
 
@@ -29 +30 @@
 #cmakedefine LEMON_USE_WIN32_THREADS 1
 
+#cmakedefine LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS 1
+
 #endif

lemon/config.h.in

@@ -5 +5 @@
 
 #cmakedefine LEMON_HAVE_LONG_LONG 1
+
+#cmakedefine LEMON_CXX11 1
 
 #cmakedefine LEMON_WIN32 1