COIN-OR::LEMON - Graph Library

Changeset 1238:736436e516d3 in lemon


Ignore:
Timestamp:
07/30/13 15:12:17 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.2
Parents:
1183:2c48ba00fccd (diff), 1236:756022ac1674 (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 fix #470 to branch 1.2

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/core.h

    r1161 r1238  
    3636#ifdef _MSC_VER
    3737#pragma warning( disable : 4250 4355 4503 4800 4996 )
     38#endif
     39
     40#ifdef __GNUC__
     41// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
     42#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
    3843#endif
    3944
  • lemon/core.h

    r1236 r1238  
    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).
     
    12471247  protected:
    12481248
    1249     class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type {
     1249    class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type
     1250    {
    12501251      typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent;
    12511252
     
    12861287    };
    12871288
    1288   protected: 
     1289  protected:
    12891290
    12901291    const Digraph &_g;
  • test/lp_test.cc

    r1141 r1237  
    241241  {
    242242    LP::DualExpr e,f,g;
    243     LP::Row p1 = INVALID, p2 = INVALID, p3 = INVALID,
    244       p4 = INVALID, p5 = INVALID;
     243    LP::Row p1 = INVALID, p2 = INVALID;
    245244
    246245    e[p1]=2;
  • test/lp_test.cc

    r1232 r1237  
    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.