Changes in / [1255:9d1616d708ee:1256:cae19e9eeca4] in lemon

Files:

• lemon/core.h (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (1 diff)
• lemon/lp_base.h (modified) (1 diff)
• test/lp_test.cc (modified) (1 diff)

lemon/core.h

@@ -39 +39 @@
 
 #ifdef __GNUC__
+#define GCC_VERSION (__GNUC__ * 10000                   \
+                     + __GNUC_MINOR__ * 100             \
+                     + __GNUC_PATCHLEVEL__)
+#endif
+
+#if GCC_VERSION >= 40800
 // Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"

lemon/graph_to_eps.h

@@ -223 +223 @@
   using T::_copyright;
 
-  using typename T::NodeTextColorType;
+  using T::NodeTextColorType;
   using T::CUST_COL;
   using T::DIST_COL;

lemon/lp_base.h

@@ -1008 +1008 @@
   public:
 
-    ///\e \ 
+    ///Unsupported file format exception
     class UnsupportedFormatError : public Exception
     {

test/lp_test.cc

@@ -199 +199 @@
       c = c <= 4;
       LP::Constr c2;
+#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 )
+      c2 = ( -3 <= v ) <= 4;
+#else
       c2 = -3 <= v <= 4;
+#endif
+
     }