Changeset 1259:8b2d4e5d96e4 in lemon for lemon/core.h
- Timestamp:
- 08/07/13 06:55:05 (11 years ago)
- 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
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/core.h
r1159 r1259 36 36 #ifdef _MSC_VER 37 37 #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" 38 49 #endif 39 50 -
lemon/core.h
r1246 r1259 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 095 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 1253 1253 protected: 1254 1254 1255 class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type { 1255 class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type 1256 { 1256 1257 typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent; 1257 1258 … … 1292 1293 }; 1293 1294 1294 protected: 1295 protected: 1295 1296 1296 1297 const Digraph &_g;
Note: See TracChangeset
for help on using the changeset viewer.