# HG changeset patch # User Alpar Juttner # Date 1375784466 -7200 # Node ID 2c2e8df67ddcfa5f161b0593ce68724bdd082cab # Parent af461bae06015ce888be4f50dba71002eb57ec8a# Parent 115031ac800121724cf94183af2a2c8c58b619b7 Merge further fixes #470 to branch 1.2 diff -r af461bae0601 -r 2c2e8df67ddc lemon/core.h --- a/lemon/core.h Tue Jul 30 15:53:02 2013 +0200 +++ b/lemon/core.h Tue Aug 06 12:21:06 2013 +0200 @@ -38,6 +38,12 @@ #endif #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" #endif diff -r af461bae0601 -r 2c2e8df67ddc lemon/graph_to_eps.h --- a/lemon/graph_to_eps.h Tue Jul 30 15:53:02 2013 +0200 +++ b/lemon/graph_to_eps.h Tue Aug 06 12:21:06 2013 +0200 @@ -222,7 +222,7 @@ using T::_title; using T::_copyright; - using typename T::NodeTextColorType; + using T::NodeTextColorType; using T::CUST_COL; using T::DIST_COL; using T::DIST_BW; diff -r af461bae0601 -r 2c2e8df67ddc test/lp_test.cc --- a/test/lp_test.cc Tue Jul 30 15:53:02 2013 +0200 +++ b/test/lp_test.cc Tue Aug 06 12:21:06 2013 +0200 @@ -198,7 +198,12 @@ LP::Constr c = v >= -3; c = c <= 4; LP::Constr c2; +#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 ) + c2 = ( -3 <= v ) <= 4; +#else c2 = -3 <= v <= 4; +#endif + } e[x[3]]=2;