[Lemon-commits] Alpar Juttner: Merge fix #470 to branch 1.1

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/deaf433636ca
changeset: 1237:deaf433636ca
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Tue Jul 30 15:10:43 2013 +0200
description:
	Merge fix #470 to branch 1.1

diffstat:

 lemon/core.h    |  5 +++++
 test/lp_test.cc |  3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 015801ff09d1 -r deaf433636ca lemon/core.h
--- a/lemon/core.h	Fri Feb 22 16:42:56 2013 +0100
+++ b/lemon/core.h	Tue Jul 30 15:10:43 2013 +0200
@@ -37,6 +37,11 @@
 #pragma warning( disable : 4250 4355 4503 4800 4996 )
 #endif
 
+#ifdef __GNUC__
+// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
+
 ///\file
 ///\brief LEMON core utilities.
 ///
diff -r 015801ff09d1 -r deaf433636ca test/lp_test.cc
--- a/test/lp_test.cc	Fri Feb 22 16:42:56 2013 +0100
+++ b/test/lp_test.cc	Tue Jul 30 15:10:43 2013 +0200
@@ -240,8 +240,7 @@
 
   {
     LP::DualExpr e,f,g;
-    LP::Row p1 = INVALID, p2 = INVALID, p3 = INVALID,
-      p4 = INVALID, p5 = INVALID;
+    LP::Row p1 = INVALID, p2 = INVALID;
 
     e[p1]=2;
     e[p1]+=2;