COIN-OR::LEMON - Graph Library

Changeset 1259:8b2d4e5d96e4 in lemon for lemon/core.h


Ignore:
Timestamp:
08/07/13 06:55:05 (9 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1174:a26b90a17c81 (diff), 1257:3e711ee55d31 (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 #294 to branches >=1.2

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/core.h

    r1159 r1259  
    3636#ifdef _MSC_VER
    3737#pragma warning( disable : 4250 4355 4503 4800 4996 )
     38#endif
     39
     40#ifdef __GNUC__
     41#define GCC_VERSION (__GNUC__ * 10000                   \
     42                     + __GNUC_MINOR__ * 100             \
     43                     + __GNUC_PATCHLEVEL__)
     44#endif
     45
     46#if GCC_VERSION >= 40800
     47// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
     48#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
    3849#endif
    3950
  • lemon/core.h

    r1246 r1259  
    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.