From 4bb7a8502cc90798bf82ada3e8248357c29faed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com> Date: Thu, 11 Feb 2016 15:47:45 +0100 Subject: [PATCH] renamed NOT_DESTROYED to OPERATIONAL, better positive semantics --- .../src/measurements/MeasurementEngine.cpp | 6 +++--- .../src/measurements/MeasurementEngine.hpp | 2 +- alib2measure/src/measurements/measurements.cpp | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alib2measure/src/measurements/MeasurementEngine.cpp b/alib2measure/src/measurements/MeasurementEngine.cpp index b25fe87903..24b4e744f5 100644 --- a/alib2measure/src/measurements/MeasurementEngine.cpp +++ b/alib2measure/src/measurements/MeasurementEngine.cpp @@ -7,16 +7,16 @@ namespace measurements { MeasurementEngine MeasurementEngine::INSTANCE; -bool MeasurementEngine::NOT_DESTROYED; +bool MeasurementEngine::OPERATIONAL; MeasurementEngine::MeasurementEngine ( ) { - MeasurementEngine::NOT_DESTROYED = true; + MeasurementEngine::OPERATIONAL = true; reset_measurements ( ); } MeasurementEngine::~MeasurementEngine ( ) { - MeasurementEngine::NOT_DESTROYED = false; + MeasurementEngine::OPERATIONAL = false; } void MeasurementEngine::push_measurement_frame ( measurements::stealth_string frame_name, measurements::Type frame_type ) { diff --git a/alib2measure/src/measurements/MeasurementEngine.hpp b/alib2measure/src/measurements/MeasurementEngine.hpp index f7211a8dd2..fafe143787 100644 --- a/alib2measure/src/measurements/MeasurementEngine.hpp +++ b/alib2measure/src/measurements/MeasurementEngine.hpp @@ -29,7 +29,7 @@ public: ~MeasurementEngine ( ); static MeasurementEngine INSTANCE; - static bool NOT_DESTROYED; + static bool OPERATIONAL; }; } diff --git a/alib2measure/src/measurements/measurements.cpp b/alib2measure/src/measurements/measurements.cpp index 9dc09222f0..906abcd190 100644 --- a/alib2measure/src/measurements/measurements.cpp +++ b/alib2measure/src/measurements/measurements.cpp @@ -7,22 +7,22 @@ namespace measurements { void start ( measurements::stealth_string name, measurements::Type type ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) MeasurementEngine::INSTANCE.push_measurement_frame ( std::move ( name ), type ); } void end ( ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) MeasurementEngine::INSTANCE.pop_measurement_frame ( ); } void reset ( ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) MeasurementEngine::INSTANCE.reset_measurements ( ); } MeasurementResults results ( ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) return MeasurementEngine::INSTANCE.get_results ( ); else return MeasurementResults ( ); @@ -30,19 +30,19 @@ MeasurementResults results ( ) { template < typename Hint > void hint ( Hint hint ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) MeasurementEngine::INSTANCE.hint ( std::move ( hint ) ); } template < > void hint ( MemoryHint hint ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) MeasurementEngine::INSTANCE.hint ( std::move ( hint ) ); } template < > void hint ( CounterHint hint ) { - if ( MeasurementEngine::NOT_DESTROYED ) + if ( MeasurementEngine::OPERATIONAL ) MeasurementEngine::INSTANCE.hint ( std::move ( hint ) ); } -- GitLab