Merge branch 'develop'

This commit is contained in:
Daniel James 2014-05-26 23:03:24 +01:00
commit 036f6b9107

View File

@ -320,7 +320,7 @@ public:
system::system( double x )
: pbase0_type( 0.2 )
, pbase1_type()
, pbase2_type( -16, &this->pbase0_type::member )
, pbase2_type( -16, &this->pbase0_type::member.y )
, pbase3_type( x, static_cast<int *>(NULL) )
, base1_type( pbase3_type::member, pbase1_type::member )
, base2_type( pbase2_type::member )