From 577385fe43c868b328094a9b5f896f7c585f011f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Mon, 22 Feb 2016 20:32:37 +0100
Subject: [PATCH] merge fixes
---
.../src/measurements/MeasurementXmlFactory.cpp | 8 ++++----
.../src/measurements/MeasurementXmlFactory.hpp | 2 +-
ameasure2/makefile.conf | 6 +++---
ameasure2/src/ameasure.cpp | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
rename {alib2measure => alib2common}/src/measurements/MeasurementXmlFactory.cpp (98%)
rename {alib2measure => alib2common}/src/measurements/MeasurementXmlFactory.hpp (99%)
diff --git a/alib2measure/src/measurements/MeasurementXmlFactory.cpp b/alib2common/src/measurements/MeasurementXmlFactory.cpp
similarity index 98%
rename from alib2measure/src/measurements/MeasurementXmlFactory.cpp
rename to alib2common/src/measurements/MeasurementXmlFactory.cpp
index 118e3bd28c..06bb32b916 100644
--- a/alib2measure/src/measurements/MeasurementXmlFactory.cpp
+++ b/alib2common/src/measurements/MeasurementXmlFactory.cpp
@@ -2,9 +2,9 @@
* Author: Radovan Cerveny
*/
-#include "sax/FromXMLParserHelper.h"
+#include "../sax/FromXMLParserHelper.h"
#include "MeasurementXmlFactory.hpp"
-#include "exception/AlibException.h"
+#include "../exception/CommonException.h"
using namespace std;
using namespace sax;
@@ -122,7 +122,7 @@ MeasurementResults MeasurementXmlFactory::parseMeasurementResults ( deque < Toke
deque < Token >::iterator iter = tokens.begin ( );
- if ( iter == tokens.end ( ) ) throw::exception::AlibException ( "Empty tokens list" );
+ if ( iter == tokens.end ( ) ) throw::exception::CommonException ( "Empty tokens list" );
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEASUREMENT_RESULTS_TAG );
@@ -130,7 +130,7 @@ MeasurementResults MeasurementXmlFactory::parseMeasurementResults ( deque < Toke
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEASUREMENT_RESULTS_TAG );
- if ( iter != tokens.end ( ) ) throw::exception::AlibException ( "Unexpeted tokens at the end of the xml" );
+ if ( iter != tokens.end ( ) ) throw::exception::CommonException ( "Unexpeted tokens at the end of the xml" );
return mr;
}
diff --git a/alib2measure/src/measurements/MeasurementXmlFactory.hpp b/alib2common/src/measurements/MeasurementXmlFactory.hpp
similarity index 99%
rename from alib2measure/src/measurements/MeasurementXmlFactory.hpp
rename to alib2common/src/measurements/MeasurementXmlFactory.hpp
index 11bfa88586..cd6b0a3957 100644
--- a/alib2measure/src/measurements/MeasurementXmlFactory.hpp
+++ b/alib2common/src/measurements/MeasurementXmlFactory.hpp
@@ -6,7 +6,7 @@
#define MEASUREMENT_PROVISIONER_XML_FACTORY_HPP_
#include <deque>
-#include "sax/Token.h"
+#include "../sax/Token.h"
#include "MeasurementResults.hpp"
namespace measurements {
diff --git a/ameasure2/makefile.conf b/ameasure2/makefile.conf
index 572f34f10b..82cb3b1377 100644
--- a/ameasure2/makefile.conf
+++ b/ameasure2/makefile.conf
@@ -1,4 +1,4 @@
EXECUTABLE:=ameasure2
-LINK_PATHS=../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/ameasure2/src/ameasure.cpp b/ameasure2/src/ameasure.cpp
index 5ce4ce8292..18ca7b7108 100644
--- a/ameasure2/src/ameasure.cpp
+++ b/ameasure2/src/ameasure.cpp
@@ -2,10 +2,10 @@
* Author: Radovan Cerveny
*/
-#include <tclap/CmdLine.h>
-#include "factory/XmlDataFactory.hpp"
#include "provisioner/MeasurementProvisionerXmlFactory.hpp"
#include "provisioner/MeasurementProvisioner.hpp"
+#include "factory/XmlDataFactory.hpp"
+#include <tclap/CmdLine.h>
#include <measure>
int main ( int argc, char * * argv ) {
@@ -28,9 +28,9 @@ int main ( int argc, char * * argv ) {
auto configuration = provisioner::MeasurementProvisionerXmlFactory::parseMeasurementProvisionerConfiguration ( tokens );
auto results = provisioner::MeasurementProvisioner::runConfiguration ( configuration );
-
std::cout << "Results on stdin:" << std::endl;
- for ( provisioner::MeasurementProvisionResults & mpr : results ) {
+
+ for ( provisioner::MeasurementProvisionResults & mpr : results )
for ( provisioner::InputFileResults & ifr : mpr ) {
std::cout << ifr.first << std::endl;
@@ -39,10 +39,10 @@ int main ( int argc, char * * argv ) {
std::cout << cr.first << std::endl;
std::cout << measurements::MeasurementFormat::TREE << cr.second << std::endl;
}
+
std::cout << "----------" << std::endl;
}
}
- }
return 0;
--
GitLab