A load more C++11 tweaks - mostly moving initialisations from constructors to inline

This commit is contained in:
Phil Nash 2017-04-25 18:56:53 +01:00
parent cc8206f4c3
commit e749724a11
23 changed files with 64 additions and 145 deletions

View file

@ -69,8 +69,8 @@ namespace TestCaseTracking {
};
Ptr<ITracker> m_rootTracker;
ITracker* m_currentTracker;
RunState m_runState;
ITracker* m_currentTracker = nullptr;
RunState m_runState = NotStarted;
public:
@ -79,12 +79,6 @@ namespace TestCaseTracking {
return s_instance;
}
TrackerContext()
: m_currentTracker( nullptr ),
m_runState( NotStarted )
{}
ITracker& startRun();
void endRun() {
@ -137,13 +131,12 @@ namespace TestCaseTracking {
TrackerContext& m_ctx;
ITracker* m_parent;
Children m_children;
CycleState m_runState;
CycleState m_runState = NotStarted;
public:
TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
: m_nameAndLocation( nameAndLocation ),
m_ctx( ctx ),
m_parent( parent ),
m_runState( NotStarted )
m_parent( parent )
{}
virtual ~TrackerBase();
@ -302,12 +295,11 @@ namespace TestCaseTracking {
class IndexTracker : public TrackerBase {
int m_size;
int m_index;
int m_index = -1;
public:
IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size )
: TrackerBase( nameAndLocation, ctx, parent ),
m_size( size ),
m_index( -1 )
m_size( size )
{}
virtual ~IndexTracker();