Changeset - r977:9a3187204242
« 976:426a70
978:eb252f »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Intel C++ compatibility fix in max_cardinality_search.h
0 1 0
default
1 file changed with 15 insertions and 8 deletions:
lemon/max_cardinality_search.h
15
8
↑ Collapse diff ↑
lemon/max_cardinality_search.h
Show white space 6 line context
... ... 
@@ -402,15 +402,8 @@
402 402 
    ///
403 403 
    ///\param digraph the digraph the algorithm will run on.
404 404 
    ///\param capacity the capacity map used by the algorithm.
405 
    ///When no capacity map given, a constant 1 capacity map will
406 
    ///be allocated.
407 
#ifdef DOXYGEN
408 405 
    MaxCardinalitySearch(const Digraph& digraph,
409 
			 const CapacityMap& capacity=0 ) :
410 
#else
411 
    MaxCardinalitySearch(const Digraph& digraph,
412 
			 const CapacityMap& capacity=*static_cast<const CapacityMap*>(0) ) :
413 
#endif
406 
			 const CapacityMap& capacity) :
414 407 
      _graph(&digraph),
415 408 
      _capacity(&capacity), local_capacity(false),
416 409 
      _cardinality(0), local_cardinality(false),
... ... 
@@ -419,6 +412,20 @@
419 412 
      _heap(0), local_heap(false)
420 413 
    { }
421 414 

			




	
	415
	
		
    /// \brief Constructor.


			




	
	416
	
		
    ///


			




	
	417
	
		
    ///\param digraph the digraph the algorithm will run on.


			




	
	418
	
		
    ///


			




	
	419
	
		
    ///A constant 1 capacity map will be allocated.


			




	
	420
	
		
    MaxCardinalitySearch(const Digraph& digraph) :


			




	
	421
	
		
      _graph(&digraph),


			




	
	422
	
		
      _capacity(0), local_capacity(false),


			




	
	423
	
		
      _cardinality(0), local_cardinality(false),


			




	
	424
	
		
      _processed(0), local_processed(false),


			




	
	425
	
		
      _heap_cross_ref(0), local_heap_cross_ref(false),


			




	
	426
	
		
      _heap(0), local_heap(false)


			




	
	427
	
		
    { }


			




	
	428
	
		

			




	422
	429
	
		
    /// \brief Destructor.


			




	423
	430
	
		
    ~MaxCardinalitySearch() {


			




	424
	431
	
		
      if(local_capacity) delete _capacity;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)