COIN-OR::LEMON - Graph Library

Changeset 981:2c2e8df67ddc in lemon-1.2 for lemon/core.h


Ignore:
Timestamp:
08/06/13 12:21:06 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.2
Parents:
978:af461bae0601 (diff), 980: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.2

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/core.h

    r976 r981  
    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

    r979 r981  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2010
    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 : public ItemSetTraits<GR, Node>::template Map<Arc>::Type
     1256    {
    12561257      typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent;
    12571258
     
    12921293    };
    12931294
    1294   protected: 
     1295  protected:
    12951296
    12961297    const Digraph &_g;
Note: See TracChangeset for help on using the changeset viewer.