[Lemon-commits] Alpar Juttner: Intel C++ compatibility fix in ma...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/9a3187204242
changeset: 1129:9a3187204242
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Thu Jan 19 15:25:06 2012 +0100
description:
	Intel C++ compatibility fix in max_cardinality_search.h

diffstat:

 lemon/max_cardinality_search.h |  23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diffs (41 lines):

diff --git a/lemon/max_cardinality_search.h b/lemon/max_cardinality_search.h
--- a/lemon/max_cardinality_search.h
+++ b/lemon/max_cardinality_search.h
@@ -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<const CapacityMap*>(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;