Changeset 1416:f179aa1045a4 in lemon for 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)

Location:

lemon

Files:

• bfs.h (modified) (1 diff)
• concepts/graph_components.h (modified) (3 diffs)
• concepts/path.h (modified) (1 diff)
• config.h.in (modified) (2 diffs)
• core.h (modified) (2 diffs)
• dfs.h (modified) (1 diff)
• nagamochi_ibaraki.h (modified) (1 diff)

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