Intel C++ compatibility fix in max_cardinality_search.h
authorAlpar Juttner <alpar@cs.elte.hu>
Thu, 19 Jan 2012 15:25:06 +0100
changeset 9779a3187204242
parent 976 426a704d7483
child 978 eb252f805431
Intel C++ compatibility fix in max_cardinality_search.h
lemon/max_cardinality_search.h
     1.1 --- a/lemon/max_cardinality_search.h	Fri Jan 20 19:23:48 2012 +0100
     1.2 +++ b/lemon/max_cardinality_search.h	Thu Jan 19 15:25:06 2012 +0100
     1.3 @@ -402,15 +402,8 @@
     1.4      ///
     1.5      ///\param digraph the digraph the algorithm will run on.
     1.6      ///\param capacity the capacity map used by the algorithm.
     1.7 -    ///When no capacity map given, a constant 1 capacity map will
     1.8 -    ///be allocated.
     1.9 -#ifdef DOXYGEN
    1.10      MaxCardinalitySearch(const Digraph& digraph,
    1.11 -			 const CapacityMap& capacity=0 ) :
    1.12 -#else
    1.13 -    MaxCardinalitySearch(const Digraph& digraph,
    1.14 -			 const CapacityMap& capacity=*static_cast<const CapacityMap*>(0) ) :
    1.15 -#endif
    1.16 +			 const CapacityMap& capacity) :
    1.17        _graph(&digraph),
    1.18        _capacity(&capacity), local_capacity(false),
    1.19        _cardinality(0), local_cardinality(false),
    1.20 @@ -419,6 +412,20 @@
    1.21        _heap(0), local_heap(false)
    1.22      { }
    1.23  
    1.24 +    /// \brief Constructor.
    1.25 +    ///
    1.26 +    ///\param digraph the digraph the algorithm will run on.
    1.27 +    ///
    1.28 +    ///A constant 1 capacity map will be allocated.
    1.29 +    MaxCardinalitySearch(const Digraph& digraph) :
    1.30 +      _graph(&digraph),
    1.31 +      _capacity(0), local_capacity(false),
    1.32 +      _cardinality(0), local_cardinality(false),
    1.33 +      _processed(0), local_processed(false),
    1.34 +      _heap_cross_ref(0), local_heap_cross_ref(false),
    1.35 +      _heap(0), local_heap(false)
    1.36 +    { }
    1.37 +
    1.38      /// \brief Destructor.
    1.39      ~MaxCardinalitySearch() {
    1.40        if(local_capacity) delete _capacity;