From ebe7294e8e7f64234c263e5098b14a50d4bd3660 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 24 Mar 2016 11:50:41 +0100
Subject: [PATCH] fix merge
---
alib2common/src/measurements/MeasurementResultsXml.cpp | 2 +-
alib2common/src/measurements/MeasurementTypes.cpp | 3 +++
alib2common/src/measurements/frames/TimeDataFrame.cpp | 2 +-
alib2measurepp/src/processor/MeasurementProcessorOutput.cpp | 4 ++++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/alib2common/src/measurements/MeasurementResultsXml.cpp b/alib2common/src/measurements/MeasurementResultsXml.cpp
index 44fbf895e4..011d8be86d 100644
--- a/alib2common/src/measurements/MeasurementResultsXml.cpp
+++ b/alib2common/src/measurements/MeasurementResultsXml.cpp
@@ -321,7 +321,7 @@ void MeasurementResultsXml::parseCounterDataFrameCounters ( const std::string &
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, COUNTER_DATA_FRAME_COUNTER_TAG );
stealth_string counterName;
- CounterHint::value_type counterValue;
+ CounterHint::value_type counterValue = -1; //FIXME Radku overit
for ( ; ; ) {
if ( !FromXMLParserHelper::isTokenType ( iter, Token::TokenType::START_ELEMENT ) ) break;
diff --git a/alib2common/src/measurements/MeasurementTypes.cpp b/alib2common/src/measurements/MeasurementTypes.cpp
index 1619dad329..fe19c0f323 100644
--- a/alib2common/src/measurements/MeasurementTypes.cpp
+++ b/alib2common/src/measurements/MeasurementTypes.cpp
@@ -25,6 +25,9 @@ std::string to_string ( Type t ) {
case Type::AUXILIARY:
return "AUXILIARY";
+
+ default:
+ throw::exception::CommonException ( "Missing case.");
}
}
diff --git a/alib2common/src/measurements/frames/TimeDataFrame.cpp b/alib2common/src/measurements/frames/TimeDataFrame.cpp
index 7c9834e43e..8107b3eb2e 100644
--- a/alib2common/src/measurements/frames/TimeDataFrame.cpp
+++ b/alib2common/src/measurements/frames/TimeDataFrame.cpp
@@ -28,7 +28,7 @@ void TimeDataFrame::update ( unsigned frameIdx, measurements::stealth_vector < M
}
TimeDataFrame TimeDataFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
- TimeDataFrame aggregatedTimeDataFrame { };
+ TimeDataFrame aggregatedTimeDataFrame;
// we want to compute simple average of times
for ( const MeasurementFrame & frame : framesToAggregate ) {
diff --git a/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp b/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
index 2b0f372b34..cd310ed601 100644
--- a/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
+++ b/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
@@ -7,6 +7,7 @@
#include "sax/SaxComposeInterface.h"
#include <set>
#include <iostream>
+#include <exception/CommonException.h>
namespace measurements {
@@ -185,6 +186,9 @@ std::string MeasurementProcessorOutput::getData ( const MeasurementFrame & frame
case OutputEngine::COUNTER:
return MeasurementProcessorViews::viewCounterDataFrame ( frame, mpo.outputEngineAttr );
+
+ default:
+ throw::exception::CommonException ( "Missing case.");
}
}
--
GitLab