Changeset 1416:f179aa1045a4 in lemon

Timestamp:

11/01/18 11:27:05 (6 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Children:

1417:2236d00ca778, 1422:332eab7995fe

Phase:

public

Message:

Suppress unused typdef warnings (#615)

Files:

• CMakeLists.txt (modified) (1 diff)
• lemon/bfs.h (modified) (1 diff)
• lemon/concepts/graph_components.h (modified) (3 diffs)
• lemon/concepts/path.h (modified) (1 diff)
• lemon/config.h.in (modified) (2 diffs)
• lemon/core.h (modified) (2 diffs)
• lemon/dfs.h (modified) (1 diff)
• lemon/nagamochi_ibaraki.h (modified) (1 diff)
• test/adaptors_test.cc (modified) (10 diffs)

CMakeLists.txt

@@ -149 +149 @@
 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")

lemon/bfs.h

@@ -1377 +1377 @@
     struct SetReachedMapTraits : public Traits {
       typedef T ReachedMap;
-      static ReachedMap *createReachedMap(const Digraph &digraph) {
+      static ReachedMap *createReachedMap(const Digraph &) {
         LEMON_ASSERT(false, "ReachedMap is not initialized");
         return 0; // ignore warnings

lemon/concepts/graph_components.h

@@ -104 +104 @@
           i1=INVALID;
           _GraphItem i2 = i1;
+          ::lemon::ignore_unused_variable_warning(i2);
           _GraphItem i3 = INVALID;
 
@@ -735 +736 @@
 
           Item bi = it1;
+          ::lemon::ignore_unused_variable_warning(bi);
           bi = it2;
         }
@@ -825 +827 @@
           ++(++it1);
           Item e = it1;
+          ::lemon::ignore_unused_variable_warning(e);
           e = it2;
         }

lemon/concepts/path.h

@@ -71 +71 @@
       /// \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/config.h.in

@@ -3 +3 @@
 
 #define LEMON_VERSION "@PROJECT_VERSION@"
+
 #cmakedefine LEMON_HAVE_LONG_LONG 1
 
@@ -27 +28 @@
 #cmakedefine LEMON_USE_WIN32_THREADS 1
 
+#cmakedefine LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS 1
+
 #endif

lemon/core.h

@@ -34 +34 @@
 // C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
 // C4996: 'function': was declared deprecated
+
+#include <lemon/config.h>
+
 #ifdef _MSC_VER
 #pragma warning( disable : 4250 4267 4355 4503 4800 4996 )
 #endif
 
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
+#if LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS
+// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc >=4.8 and clang
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif
@@ -46 +49 @@
 #include <algorithm>
 
-#include <lemon/config.h>
 #include <lemon/bits/enable_if.h>
 #include <lemon/bits/traits.h>

lemon/dfs.h

@@ -1319 +1319 @@
     struct SetReachedMapTraits : public Traits {
       typedef T ReachedMap;
-      static ReachedMap *createReachedMap(const Digraph &digraph) {
+      static ReachedMap *createReachedMap(const Digraph &) {
         LEMON_ASSERT(false, "ReachedMap is not initialized");
         return 0; // ignore warnings

lemon/nagamochi_ibaraki.h

@@ -175 +175 @@
       typedef CR HeapCrossRef;
       typedef H Heap;
-      static HeapCrossRef *createHeapCrossRef(int num) {
+      static HeapCrossRef *createHeapCrossRef(int) {
         LEMON_ASSERT(false, "HeapCrossRef is not initialized");
         return 0; // ignore warnings

test/adaptors_test.cc

@@ -146 +146 @@
   // Check the conversion of nodes and arcs
   Digraph::Node nd = n4;
+  ::lemon::ignore_unused_variable_warning(nd);
   nd = n4;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Digraph::Arc ad = a4;
+  ::lemon::ignore_unused_variable_warning(ad);
   ad = a5;
   Adaptor::Arc aa = a1;
+  ::lemon::ignore_unused_variable_warning(aa);
   aa = a2;
 }
@@ -270 +274 @@
   // Check the conversion of nodes and arcs
   Digraph::Node nd = n3;
+  ::lemon::ignore_unused_variable_warning(nd);
   nd = n3;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Digraph::Arc ad = a3;
+  ::lemon::ignore_unused_variable_warning(ad);
   ad = a3;
   Adaptor::Arc aa = a1;
+  ::lemon::ignore_unused_variable_warning(aa);
   aa = a2;
 }
@@ -366 +374 @@
   // Check the conversion of nodes and arcs
   Digraph::Node nd = n3;
+  ::lemon::ignore_unused_variable_warning(nd);
   nd = n3;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Digraph::Arc ad = a3;
+  ::lemon::ignore_unused_variable_warning(ad);
   ad = a3;
   Adaptor::Arc aa = a1;
+  ::lemon::ignore_unused_variable_warning(aa);
   aa = a2;
 }
@@ -464 +476 @@
   // Check the conversion of nodes and arcs
   Digraph::Node nd = n3;
+  ::lemon::ignore_unused_variable_warning(nd);
   nd = n3;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Digraph::Arc ad = a3;
+  ::lemon::ignore_unused_variable_warning(ad);
   ad = a3;
   Adaptor::Arc aa = a1;
+  ::lemon::ignore_unused_variable_warning(aa);
   aa = a2;
 }
@@ -575 +591 @@
   // Check the conversion of nodes and arcs/edges
   Digraph::Node nd = n3;
+  ::lemon::ignore_unused_variable_warning(nd);
   nd = n3;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Digraph::Arc ad = e3;
+  ::lemon::ignore_unused_variable_warning(ad);
   ad = e3;
   Adaptor::Edge ea = a1;
+  ::lemon::ignore_unused_variable_warning(ea);
   ea = a2;
 }
@@ -735 +755 @@
   // Check the conversion of nodes and arcs
   Digraph::Node nd = Adaptor::NodeIt(adaptor);
+  ::lemon::ignore_unused_variable_warning(nd);
   nd = ++Adaptor::NodeIt(adaptor);
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Digraph::Arc ad = Adaptor::ArcIt(adaptor);
+  ::lemon::ignore_unused_variable_warning(ad);
   ad = ++Adaptor::ArcIt(adaptor);
 }
@@ -988 +1011 @@
   // Check the conversion of nodes and edges
   Graph::Node ng = n3;
+  ::lemon::ignore_unused_variable_warning(ng);
   ng = n4;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Graph::Edge eg = e3;
+  ::lemon::ignore_unused_variable_warning(eg);
   eg = e4;
   Adaptor::Edge ea = e1;
+  ::lemon::ignore_unused_variable_warning(ea);
   ea = e2;
 }
@@ -1093 +1120 @@
   // Check the conversion of nodes and edges
   Graph::Node ng = n3;
+  ::lemon::ignore_unused_variable_warning(ng);
   ng = n4;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Graph::Edge eg = e3;
+  ::lemon::ignore_unused_variable_warning(eg);
   eg = e4;
   Adaptor::Edge ea = e1;
+  ::lemon::ignore_unused_variable_warning(ea);
   ea = e2;
 }
@@ -1199 +1230 @@
   // Check the conversion of nodes and edges
   Graph::Node ng = n3;
+  ::lemon::ignore_unused_variable_warning(ng);
   ng = n4;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Graph::Edge eg = e3;
+  ::lemon::ignore_unused_variable_warning(eg);
   eg = e4;
   Adaptor::Edge ea = e1;
+  ::lemon::ignore_unused_variable_warning(ea);
   ea = e2;
 }
@@ -1357 +1392 @@
   // Check the conversion of nodes and arcs/edges
   Graph::Node ng = n3;
+  ::lemon::ignore_unused_variable_warning(ng);
   ng = n3;
   Adaptor::Node na = n1;
+  ::lemon::ignore_unused_variable_warning(na);
   na = n2;
   Graph::Edge eg = e3;
+  ::lemon::ignore_unused_variable_warning(eg);
   eg = e3;
   Adaptor::Arc aa = e1;
+  ::lemon::ignore_unused_variable_warning(aa);
   aa = e2;
 }