Merge fix #470 to branch 1.2 1.2
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 30 Jul 2013 15:12:17 +0200
branch1.2
changeset 976736436e516d3
parent 974 2c48ba00fccd
parent 975 756022ac1674
child 978 af461bae0601
Merge fix #470 to branch 1.2
lemon/core.h
test/lp_test.cc
     1.1 --- a/lemon/core.h	Fri Feb 22 16:44:26 2013 +0100
     1.2 +++ b/lemon/core.h	Tue Jul 30 15:12:17 2013 +0200
     1.3 @@ -37,6 +37,11 @@
     1.4  #pragma warning( disable : 4250 4355 4503 4800 4996 )
     1.5  #endif
     1.6  
     1.7 +#ifdef __GNUC__
     1.8 +// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
     1.9 +#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
    1.10 +#endif
    1.11 +
    1.12  ///\file
    1.13  ///\brief LEMON core utilities.
    1.14  ///
     2.1 --- a/test/lp_test.cc	Fri Feb 22 16:44:26 2013 +0100
     2.2 +++ b/test/lp_test.cc	Tue Jul 30 15:12:17 2013 +0200
     2.3 @@ -240,8 +240,7 @@
     2.4  
     2.5    {
     2.6      LP::DualExpr e,f,g;
     2.7 -    LP::Row p1 = INVALID, p2 = INVALID, p3 = INVALID,
     2.8 -      p4 = INVALID, p5 = INVALID;
     2.9 +    LP::Row p1 = INVALID, p2 = INVALID;
    2.10  
    2.11      e[p1]=2;
    2.12      e[p1]+=2;