diff --git a/alib2measure/src/measurements/MeasurementFrames.hpp b/alib2measure/src/measurements/MeasurementFrames.hpp index 40c869fe1eb44f1273fa24fc3e649dcaa0931ee1..025121becf3eaa31a36eaabcc3f754e019cd4514 100644 --- a/alib2measure/src/measurements/MeasurementFrames.hpp +++ b/alib2measure/src/measurements/MeasurementFrames.hpp @@ -50,6 +50,7 @@ struct TimeDataFrame { static void xml_tokens ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & ); }; +std::ostream & operator <<( std::ostream &, const std::chrono::microseconds & ); std::ostream & operator <<( std::ostream &, const TimeDataFrame & ); struct MeasurementFrame { diff --git a/alib2measure/src/measurements/MeasurementResults.cpp b/alib2measure/src/measurements/MeasurementResults.cpp index dfd9d5a50dff5716e7ce9cd10884f1fd9f9d8925..dfd5c3ea0b1b7edf44988db366e690b78e28eb20 100644 --- a/alib2measure/src/measurements/MeasurementResults.cpp +++ b/alib2measure/src/measurements/MeasurementResults.cpp @@ -118,7 +118,7 @@ std::ostream & operator <<( std::ostream & os, const MeasurementResults & mr ) { mr.print_as_tree ( os ); break; - case MeasurementFormat::XML: + default: /* MeasurementFormat::XML: */ sax::SaxComposeInterface::printStream ( os, mr.xml_tokens ( ) ); break; } diff --git a/alib2measure/src/measurements/MeasurementTypes.hpp b/alib2measure/src/measurements/MeasurementTypes.hpp index 6e504d0b05d30a202634206883433600dfbc4a4c..86e8b00ce3607b630957df68df10ed88f36384e0 100644 --- a/alib2measure/src/measurements/MeasurementTypes.hpp +++ b/alib2measure/src/measurements/MeasurementTypes.hpp @@ -45,7 +45,7 @@ public: using stealth_string = std::basic_string < char, std::char_traits < char >, stealth_allocator < char > >; std::string to_string ( const stealth_string & ); -std::string to_string ( stealth_string &); +std::string to_string ( stealth_string & ); template < typename T > using stealth_vector = std::vector < T, stealth_allocator < T > >; diff --git a/alib2measure/src/measurements/TimeDataFrame.cpp b/alib2measure/src/measurements/TimeDataFrame.cpp index 6965d96b760fee294c26460e9162661d092ab2af..7d39cb51c9bc74f00fe195adf556a4141c1f7479 100644 --- a/alib2measure/src/measurements/TimeDataFrame.cpp +++ b/alib2measure/src/measurements/TimeDataFrame.cpp @@ -44,4 +44,9 @@ std::ostream & operator <<( std::ostream & os, const TimeDataFrame & tdf ) { return os; } +std::ostream & operator <<( std::ostream & os, const std::chrono::microseconds & ms ) { + os << ms.count ( ) << "ms"; + return os; +} + } diff --git a/alib2measure/test-src/measurements/MeasurementsTest.cpp b/alib2measure/test-src/measurements/MeasurementsTest.cpp index 59f8ca838349e138d166a194727d9d71ab375de4..e34b30961bfea2c36df7c018cf3ee36acfabc403 100644 --- a/alib2measure/test-src/measurements/MeasurementsTest.cpp +++ b/alib2measure/test-src/measurements/MeasurementsTest.cpp @@ -1,8 +1,8 @@ #include "MeasurementsTest.h" -#include "measurements/measurements.hpp" #include "sax/SaxComposeInterface.h" #include <thread> #include <cmath> +#include <measure> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( MeasurementsTest, "measurements" ); CPPUNIT_TEST_SUITE_REGISTRATION ( MeasurementsTest );