COIN-OR::LEMON - Graph Library

Changeset 1248:14394c9603c2 in lemon


Ignore:
Timestamp:
08/06/13 12:19:11 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.1
Parents:
1243:79f149ee0230 (diff), 1247:115031ac8001 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge further fixes #470 to branch 1.1

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/core.h

    r1237 r1248  
    3939
    4040#ifdef __GNUC__
     41#define GCC_VERSION (__GNUC__ * 10000                   \
     42                     + __GNUC_MINOR__ * 100             \
     43                     + __GNUC_PATCHLEVEL__)
     44#endif
     45
     46#if GCC_VERSION >= 40800
    4147// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
    4248#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  • lemon/core.h

    r1246 r1248  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    12531253  protected:
    12541254
    1255     class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type {
     1255    class AutoNodeMap :
     1256      public ItemSetTraits<GR, Node>::template Map<Arc>::Type {
    12561257      typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent;
    12571258
     
    12921293    };
    12931294
    1294   protected: 
     1295  protected:
    12951296
    12961297    const Digraph &_g;
  • lemon/graph_to_eps.h

    r1158 r1248  
    223223  using T::_copyright;
    224224
    225   using typename T::NodeTextColorType;
     225  using T::NodeTextColorType;
    226226  using T::CUST_COL;
    227227  using T::DIST_COL;
  • lemon/graph_to_eps.h

    r1247 r1248  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
  • test/lp_test.cc

    r1237 r1248  
    199199      c = c <= 4;
    200200      LP::Constr c2;
     201#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 )
     202      c2 = ( -3 <= v ) <= 4;
     203#else
    201204      c2 = -3 <= v <= 4;
     205#endif
     206
    202207    }
    203208
  • test/lp_test.cc

    r1247 r1248  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
Note: See TracChangeset for help on using the changeset viewer.