Merge further fixes #470 to branch 1.1 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 06 Aug 2013 12:19:11 +0200
branch1.1
changeset 80614394c9603c2
parent 803 79f149ee0230
parent 805 115031ac8001
child 808 bdfc038f364c
Merge further fixes #470 to branch 1.1
lemon/core.h
lemon/graph_to_eps.h
test/lp_test.cc
     1.1 --- a/lemon/core.h	Tue Jul 30 15:52:38 2013 +0200
     1.2 +++ b/lemon/core.h	Tue Aug 06 12:19:11 2013 +0200
     1.3 @@ -38,6 +38,12 @@
     1.4  #endif
     1.5  
     1.6  #ifdef __GNUC__
     1.7 +#define GCC_VERSION (__GNUC__ * 10000                   \
     1.8 +                     + __GNUC_MINOR__ * 100             \
     1.9 +                     + __GNUC_PATCHLEVEL__)
    1.10 +#endif
    1.11 +
    1.12 +#if GCC_VERSION >= 40800
    1.13  // Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
    1.14  #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
    1.15  #endif
     2.1 --- a/lemon/graph_to_eps.h	Tue Jul 30 15:52:38 2013 +0200
     2.2 +++ b/lemon/graph_to_eps.h	Tue Aug 06 12:19:11 2013 +0200
     2.3 @@ -222,7 +222,7 @@
     2.4    using T::_title;
     2.5    using T::_copyright;
     2.6  
     2.7 -  using typename T::NodeTextColorType;
     2.8 +  using T::NodeTextColorType;
     2.9    using T::CUST_COL;
    2.10    using T::DIST_COL;
    2.11    using T::DIST_BW;
     3.1 --- a/test/lp_test.cc	Tue Jul 30 15:52:38 2013 +0200
     3.2 +++ b/test/lp_test.cc	Tue Aug 06 12:19:11 2013 +0200
     3.3 @@ -198,7 +198,12 @@
     3.4        LP::Constr c = v >= -3;
     3.5        c = c <= 4;
     3.6        LP::Constr c2;
     3.7 +#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 )
     3.8 +      c2 = ( -3 <= v ) <= 4;
     3.9 +#else
    3.10        c2 = -3 <= v <= 4;
    3.11 +#endif
    3.12 +
    3.13      }
    3.14  
    3.15      e[x[3]]=2;