From e9b4b3cf156e1cb62b5fdf43bcdcdfaadd9c2f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Thu, 24 Mar 2016 13:11:33 +0100
Subject: [PATCH] merge fixes #2
---
alib2common/src/measurements/frames/TimeDataFrame.cpp | 2 +-
alib2measurepp/src/provisioner/MeasurementProvisioner.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/alib2common/src/measurements/frames/TimeDataFrame.cpp b/alib2common/src/measurements/frames/TimeDataFrame.cpp
index 8107b3eb2e..81d92709e9 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 = TimeDataFrame ( );
// we want to compute simple average of times
for ( const MeasurementFrame & frame : framesToAggregate ) {
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
index 96822514b9..b81b0060ed 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
@@ -98,7 +98,7 @@ MPRPipelineResult MeasurementProvisioner::runPipeline ( const MPPipeline & pipel
vector < vector < MeasurementResults > > commandMeasurementSubResults;
- MPRPipelineResult pipelineFinalResults { };
+ MPRPipelineResult pipelineFinalResults = MPRPipelineResult ( );
// we repeat the pipeline measurement several times, then aggregate the results
for ( int iteration = 0; iteration < cfg.environment.pipelineIterations; ++iteration ) {
--
GitLab