# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1375189937 -7200
# Node ID 736436e516d3c5804193bae467e12462247ef093
# Parent  2c48ba00fccd59b372592c5b47ca4cf7ab4b58ad# Parent  756022ac167475c2d4675bbf4c00169ade2bea54
Merge fix #470 to branch 1.2

diff -r 2c48ba00fccd -r 736436e516d3 lemon/core.h
--- a/lemon/core.h	Fri Feb 22 16:44:26 2013 +0100
+++ b/lemon/core.h	Tue Jul 30 15:12:17 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 2c48ba00fccd -r 736436e516d3 test/lp_test.cc
--- a/test/lp_test.cc	Fri Feb 22 16:44:26 2013 +0100
+++ b/test/lp_test.cc	Tue Jul 30 15:12:17 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;