# HG changeset patch # User Alpar Juttner # Date 1326983106 -3600 # Node ID 9a318720424257176be9663017ce74b2b151bbda # Parent 426a704d7483d984ce0d86f815565f789c671760 Intel C++ compatibility fix in max_cardinality_search.h diff -r 426a704d7483 -r 9a3187204242 lemon/max_cardinality_search.h --- a/lemon/max_cardinality_search.h Fri Jan 20 19:23:48 2012 +0100 +++ b/lemon/max_cardinality_search.h Thu Jan 19 15:25:06 2012 +0100 @@ -402,15 +402,8 @@ /// ///\param digraph the digraph the algorithm will run on. ///\param capacity the capacity map used by the algorithm. - ///When no capacity map given, a constant 1 capacity map will - ///be allocated. -#ifdef DOXYGEN MaxCardinalitySearch(const Digraph& digraph, - const CapacityMap& capacity=0 ) : -#else - MaxCardinalitySearch(const Digraph& digraph, - const CapacityMap& capacity=*static_cast(0) ) : -#endif + const CapacityMap& capacity) : _graph(&digraph), _capacity(&capacity), local_capacity(false), _cardinality(0), local_cardinality(false), @@ -419,6 +412,20 @@ _heap(0), local_heap(false) { } + /// \brief Constructor. + /// + ///\param digraph the digraph the algorithm will run on. + /// + ///A constant 1 capacity map will be allocated. + MaxCardinalitySearch(const Digraph& digraph) : + _graph(&digraph), + _capacity(0), local_capacity(false), + _cardinality(0), local_cardinality(false), + _processed(0), local_processed(false), + _heap_cross_ref(0), local_heap_cross_ref(false), + _heap(0), local_heap(false) + { } + /// \brief Destructor. ~MaxCardinalitySearch() { if(local_capacity) delete _capacity;