King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

change init order to inheritance order

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@637 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2006-04-16 14:08:46 +00:00
parent e1493017a7
commit cdc57d88aa
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/loki/StrongPtr.h
View file

@ -757,9 +757,9 @@ class StrongPtr
{ {
typedef OwnershipPolicy OP; typedef OwnershipPolicy OP;
typedef ConversionPolicy CP;
typedef CheckingPolicy< T * > KP; typedef CheckingPolicy< T * > KP;
typedef ResetPolicy< T > RP; typedef ResetPolicy< T > RP;
typedef ConversionPolicy CP;
typedef DeletePolicy< T > DP; typedef DeletePolicy< T > DP;
public: public:
@ -800,7 +800,7 @@ public:
} }
StrongPtr( const StrongPtr & rhs ) StrongPtr( const StrongPtr & rhs )
: OP( rhs, Strong ), DP( rhs ), KP( rhs ), CP( rhs ) : OP( rhs, Strong ), CP( rhs ), KP( rhs ), DP( rhs )
{ {
} }
@ -817,7 +817,7 @@ public:
> >
StrongPtr( StrongPtr(
const StrongPtr< T1, S1, OP1, CP1, KP1, RP1, DP1, CNP1 > & rhs ) const StrongPtr< T1, S1, OP1, CP1, KP1, RP1, DP1, CNP1 > & rhs )
: OP( rhs, Strong ), KP( rhs ), CP( rhs ), DP( rhs ) : OP( rhs, Strong ), CP( rhs ), KP( rhs ), DP( rhs )
{ {
} }
@ -834,7 +834,7 @@ public:
> >
StrongPtr( StrongPtr(
StrongPtr< T1, S1, OP1, CP1, KP1, RP1, DP1, CNP1 > & rhs ) StrongPtr< T1, S1, OP1, CP1, KP1, RP1, DP1, CNP1 > & rhs )
: OP( rhs, Strong ), KP( rhs ), CP( rhs ), DP( rhs ) : OP( rhs, Strong ), CP( rhs ), KP( rhs ), DP( rhs )
{ {
} }
@ -1455,6 +1455,9 @@ namespace std
#endif // end file guardian #endif // end file guardian
// $Log$ // $Log$
// Revision 1.4 2006/04/16 14:08:46 syntheticpp
// change init order to inheritance order
//
// Revision 1.3 2006/04/16 13:36:26 syntheticpp // Revision 1.3 2006/04/16 13:36:26 syntheticpp
// gcc pedantic fix // gcc pedantic fix
// //