@ -17,6 +17,7 @@
# include "../cargotype.h"
# include "../cargotype.h"
# include "../date_func.h"
# include "../date_func.h"
# include "linkgraph_type.h"
# include "linkgraph_type.h"
# include <utility>
struct SaveLoad ;
struct SaveLoad ;
class LinkGraph ;
class LinkGraph ;
@ -188,20 +189,20 @@ public:
* to return something that implements operator - > , but isn ' t a pointer
* to return something that implements operator - > , but isn ' t a pointer
* from operator - > . A fake pointer .
* from operator - > . A fake pointer .
*/
*/
class FakePointer : public SmallP air< NodeID , Tedge_wrapper > {
class FakePointer : public std: : p air< NodeID , Tedge_wrapper > {
public :
public :
/**
/**
* Construct a fake pointer from a pair of NodeID and edge .
* Construct a fake pointer from a pair of NodeID and edge .
* @ param pair Pair to be " pointed " to ( in fact shallow - copied ) .
* @ param pair Pair to be " pointed " to ( in fact shallow - copied ) .
*/
*/
FakePointer ( const SmallP air< NodeID , Tedge_wrapper > & pair ) : SmallP air< NodeID , Tedge_wrapper > ( pair ) { }
FakePointer ( const std: : p air< NodeID , Tedge_wrapper > & pair ) : std: : p air< NodeID , Tedge_wrapper > ( pair ) { }
/**
/**
* Retrieve the pair by operator - > .
* Retrieve the pair by operator - > .
* @ return Pair being " pointed " to .
* @ return Pair being " pointed " to .
*/
*/
SmallP air< NodeID , Tedge_wrapper > * operator - > ( ) { return this ; }
std: : p air< NodeID , Tedge_wrapper > * operator - > ( ) { return this ; }
} ;
} ;
public :
public :
@ -266,9 +267,9 @@ public:
* Dereference with operator * .
* Dereference with operator * .
* @ return Pair of current target NodeID and edge object .
* @ return Pair of current target NodeID and edge object .
*/
*/
SmallP air< NodeID , Tedge_wrapper > operator * ( ) const
std: : p air< NodeID , Tedge_wrapper > operator * ( ) const
{
{
return SmallP air< NodeID , Tedge_wrapper > ( this - > current , Tedge_wrapper ( this - > base [ this - > current ] ) ) ;
return std: : p air< NodeID , Tedge_wrapper > ( this - > current , Tedge_wrapper ( this - > base [ this - > current ] ) ) ;
}
}
/**
/**