From cfa438ee6f3d3c5c60604472e1d4ffc683482f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Tue, 9 Feb 2016 18:03:07 +0100
Subject: [PATCH] fixed ostream output for microseconds, default output of
measurements is xml
---
alib2measure/src/measurements/MeasurementFrames.hpp | 1 +
alib2measure/src/measurements/MeasurementResults.cpp | 2 +-
alib2measure/src/measurements/MeasurementTypes.hpp | 2 +-
alib2measure/src/measurements/TimeDataFrame.cpp | 5 +++++
alib2measure/test-src/measurements/MeasurementsTest.cpp | 2 +-
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/alib2measure/src/measurements/MeasurementFrames.hpp b/alib2measure/src/measurements/MeasurementFrames.hpp
index 40c869fe1e..025121becf 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 dfd9d5a50d..dfd5c3ea0b 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 6e504d0b05..86e8b00ce3 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 6965d96b76..7d39cb51c9 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 59f8ca8383..e34b30961b 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 );
--
GitLab