From dda3689a0286cb72c51e4ed3ddfb8094fae0cdd4 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 6 Oct 2017 10:16:22 +0200
Subject: [PATCH] make measurements library independent from std ext
---
alib2algo/makefile.conf | 6 +++---
alib2algo_experimental/makefile.conf | 6 +++---
alib2aux/makefile.conf | 6 +++---
alib2cli/makefile.conf | 6 +++---
alib2common/makefile.conf | 6 +++---
alib2data/makefile.conf | 6 +++---
alib2data_experimental/makefile.conf | 6 +++---
alib2elgo/makefile.conf | 6 +++---
alib2measure/makefile.conf | 6 +++---
alib2measure/src/allocator/StealthTypes.hpp | 4 ++--
alib2measure/src/debug/New.cpp | 4 ----
alib2measure/src/measurements/MeasurementEngine.cpp | 4 ++--
alib2measure/src/measurements/MeasurementFrame.cpp | 13 +++++++++++--
alib2measure/src/measurements/MeasurementFrame.hpp | 2 +-
.../src/measurements/MeasurementResults.cpp | 4 ++--
.../src/measurements/MeasurementResults.hpp | 2 +-
alib2measure/src/measurements/MeasurementTypes.cpp | 6 +++---
.../src/measurements/frames/CounterDataFrame.cpp | 2 +-
.../src/measurements/frames/CounterDataFrame.hpp | 2 +-
.../src/measurements/frames/MemoryDataFrame.cpp | 2 +-
.../src/measurements/frames/MemoryDataFrame.hpp | 2 +-
.../src/measurements/frames/TimeDataFrame.cpp | 2 +-
.../src/measurements/frames/TimeDataFrame.hpp | 2 +-
alib2measure/test-src/main.cpp | 6 +++---
.../test-src/measurements/MeasurementsTest.cpp | 6 +-----
alib2raw/makefile.conf | 6 +++---
alib2str/makefile.conf | 6 +++---
makefile | 2 +-
28 files changed, 66 insertions(+), 65 deletions(-)
diff --git a/alib2algo/makefile.conf b/alib2algo/makefile.conf
index 7e7388d75b..cf61dd91fe 100644
--- a/alib2algo/makefile.conf
+++ b/alib2algo/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2algo
TESTBIN:=alib2test
-LINK_PATHS=../alib2str/ ../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2str alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2str/ ../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2str alib2data alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2algo_experimental/makefile.conf b/alib2algo_experimental/makefile.conf
index 37608460f7..4cde0e3a0d 100644
--- a/alib2algo_experimental/makefile.conf
+++ b/alib2algo_experimental/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2algo_experimental
TESTBIN:=alib2test
-LINK_PATHS=../alib2algo/ ../alib2str/ ../alib2data_experimental/ ../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2algo alib2str alib2data_experimental alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data_experimental/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2algo/ ../alib2str/ ../alib2data_experimental/ ../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2algo alib2str alib2data_experimental alib2data alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data_experimental/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2aux/makefile.conf b/alib2aux/makefile.conf
index d5e0051bca..48a8283358 100644
--- a/alib2aux/makefile.conf
+++ b/alib2aux/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2aux
TESTBIN:=alib2test
-LINK_PATHS=../alib2str/ ../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2str alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2str/ ../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2str alib2data alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2cli/makefile.conf b/alib2cli/makefile.conf
index c2eda967ed..7ecf4c0221 100644
--- a/alib2cli/makefile.conf
+++ b/alib2cli/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2cli
TESTBIN:=alib2test
-LINK_PATHS=../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2common/makefile.conf b/alib2common/makefile.conf
index 500838667b..ef52808c86 100644
--- a/alib2common/makefile.conf
+++ b/alib2common/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2common
TESTBIN:=alib2test
-LINK_PATHS=../alib2std/
-LINK_LIBRARIES=alib2std
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2std/src/
+LINK_PATHS=../alib2measure/ ../alib2std/
+LINK_LIBRARIES=alib2measure alib2std
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/
diff --git a/alib2data/makefile.conf b/alib2data/makefile.conf
index 91396582fb..9c716a448a 100644
--- a/alib2data/makefile.conf
+++ b/alib2data/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2data
TESTBIN:=alib2test
-LINK_PATHS=../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2data_experimental/makefile.conf b/alib2data_experimental/makefile.conf
index 0d2ae5773d..4a1fde3e56 100644
--- a/alib2data_experimental/makefile.conf
+++ b/alib2data_experimental/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2data_experimental
TESTBIN:=alib2test
-LINK_PATHS=../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2data alib2xml alib2common alib2std xml2 alib2measure
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2elgo/makefile.conf b/alib2elgo/makefile.conf
index 75ee8ec479..362e4ca0a3 100644
--- a/alib2elgo/makefile.conf
+++ b/alib2elgo/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2elgo
TESTBIN:=alib2test
-LINK_PATHS=../alib2algo/ ../alib2str/ ../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2algo alib2str alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2algo/ ../alib2str/ ../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2algo alib2str alib2data alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2measure/makefile.conf b/alib2measure/makefile.conf
index e6594da1c7..df589ff30d 100644
--- a/alib2measure/makefile.conf
+++ b/alib2measure/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2measure
TESTBIN:=alib2test
-LINK_PATHS=../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2common alib2std
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/
+LINK_PATHS=
+LINK_LIBRARIES=
+INCLUDE_PATHS=
diff --git a/alib2measure/src/allocator/StealthTypes.hpp b/alib2measure/src/allocator/StealthTypes.hpp
index 62164412ef..76956a1bed 100644
--- a/alib2measure/src/allocator/StealthTypes.hpp
+++ b/alib2measure/src/allocator/StealthTypes.hpp
@@ -20,10 +20,10 @@ std::string to_string ( stealth_string & );
stealth_string stealthStringFromString ( const std::string & );
template < typename T >
-using stealth_vector = ext::vector < T, stealth_allocator < T > >;
+using stealth_vector = std::vector < T, stealth_allocator < T > >;
template < class Key, class T, class Compare = std::less < Key > >
-using stealth_map = ext::map < Key, T, Compare, stealth_allocator < std::pair < const Key, T > > >;
+using stealth_map = std::map < Key, T, Compare, stealth_allocator < std::pair < const Key, T > > >;
}
#endif /* STEALTH_TYPES_HPP_ */
diff --git a/alib2measure/src/debug/New.cpp b/alib2measure/src/debug/New.cpp
index 2cb09e8427..3141e741e0 100644
--- a/alib2measure/src/debug/New.cpp
+++ b/alib2measure/src/debug/New.cpp
@@ -2,8 +2,6 @@
* Author: Radovan Cerveny
*/
-#ifdef __clang__
-
#include <cstdlib>
#include <new>
#include "../measurements/MeasurementNew.hpp"
@@ -19,5 +17,3 @@ void operator delete( void * ptr ) noexcept {
void operator delete( void * ptr, std::size_t ) noexcept {
operator delete( ptr, true );
}
-
-#endif
diff --git a/alib2measure/src/measurements/MeasurementEngine.cpp b/alib2measure/src/measurements/MeasurementEngine.cpp
index 9f939dc0ca..eeb60aa89a 100644
--- a/alib2measure/src/measurements/MeasurementEngine.cpp
+++ b/alib2measure/src/measurements/MeasurementEngine.cpp
@@ -3,7 +3,7 @@
*/
#include "MeasurementEngine.hpp"
-#include <exception/CommonException.h>
+#include <stdexcept>
namespace measurements {
@@ -40,7 +40,7 @@ void MeasurementEngine::popMeasurementFrame ( ) {
unsigned currentIdx = frameIdxStack.back ( );
if ( frames[currentIdx].type == measurements::Type::ROOT )
- throw::exception::CommonException ( "MeasurementEngine: popMeasurementFrame failed, no measurements started" );
+ throw std::domain_error ( "MeasurementEngine: popMeasurementFrame failed, no measurements started" );
frameIdxStack.pop_back ( );
diff --git a/alib2measure/src/measurements/MeasurementFrame.cpp b/alib2measure/src/measurements/MeasurementFrame.cpp
index e6f411460d..5fba8c2088 100644
--- a/alib2measure/src/measurements/MeasurementFrame.cpp
+++ b/alib2measure/src/measurements/MeasurementFrame.cpp
@@ -17,11 +17,20 @@ std::ostream & operator <<( std::ostream & os, const MeasurementFrame & frame )
ss << "(TIME: " << frame.time << "), (MEM: " << frame.memory << "), (COUNTER: " << frame.counter << ")";
- os << ext::make_tuple ( frame.name, frame.type, frame.parentIdx, frame.subIdxs, ss.str ( ) );
+ os << "(" << frame.name << ", " << frame.type << ", " << frame.parentIdx << ", [";
+ bool first = true;
+ for ( int subId : frame.subIdxs ) {
+ if ( first )
+ first = false;
+ else
+ os << ", ";
+ os << subId;
+ }
+ os << "], " << ss.str ( ) << ")";
return os;
}
-MeasurementFrame MeasurementFrame::aggregate ( const ext::vector < MeasurementFrame > & framesToAggregate ) {
+MeasurementFrame MeasurementFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
MeasurementFrame aggregatedFrame ( framesToAggregate[0].name, framesToAggregate[0].type, framesToAggregate[0].parentIdx );
aggregatedFrame.subIdxs = framesToAggregate[0].subIdxs;
diff --git a/alib2measure/src/measurements/MeasurementFrame.hpp b/alib2measure/src/measurements/MeasurementFrame.hpp
index 57ed741d05..a93c029c39 100644
--- a/alib2measure/src/measurements/MeasurementFrame.hpp
+++ b/alib2measure/src/measurements/MeasurementFrame.hpp
@@ -28,7 +28,7 @@ struct MeasurementFrame {
MeasurementFrame ( measurements::stealth_string, measurements::Type, unsigned );
- static MeasurementFrame aggregate ( const ext::vector < MeasurementFrame > & );
+ static MeasurementFrame aggregate ( const std::vector < MeasurementFrame > & );
};
std::ostream & operator <<( std::ostream &, const MeasurementFrame & );
diff --git a/alib2measure/src/measurements/MeasurementResults.cpp b/alib2measure/src/measurements/MeasurementResults.cpp
index b122a01bb5..a0db2a8686 100644
--- a/alib2measure/src/measurements/MeasurementResults.cpp
+++ b/alib2measure/src/measurements/MeasurementResults.cpp
@@ -96,13 +96,13 @@ void MeasurementResults::printAsTree ( std::ostream & os, unsigned idx, std::str
}
}
-MeasurementResults MeasurementResults::aggregate ( const ext::vector < MeasurementResults > & resultsToAggregate ) {
+MeasurementResults MeasurementResults::aggregate ( const std::vector < MeasurementResults > & resultsToAggregate ) {
MeasurementResults aggregatedResults;
size_t frameCount = resultsToAggregate[0].frames.size ( );
for ( size_t frameIdx = 0; frameIdx < frameCount; ++frameIdx ) {
- ext::vector < MeasurementFrame > framesToAggregate;
+ std::vector < MeasurementFrame > framesToAggregate;
for ( const MeasurementResults & measurementResults : resultsToAggregate )
framesToAggregate.push_back ( measurementResults.frames[frameIdx] );
diff --git a/alib2measure/src/measurements/MeasurementResults.hpp b/alib2measure/src/measurements/MeasurementResults.hpp
index f3410c210d..2ba9617581 100644
--- a/alib2measure/src/measurements/MeasurementResults.hpp
+++ b/alib2measure/src/measurements/MeasurementResults.hpp
@@ -28,7 +28,7 @@ struct MeasurementResults {
void printAsList ( std::ostream & ) const;
void printAsTree ( std::ostream & ) const;
- static MeasurementResults aggregate ( const ext::vector < MeasurementResults > & );
+ static MeasurementResults aggregate ( const std::vector < MeasurementResults > & );
private:
void printAsList ( std::ostream &, unsigned ) const;
diff --git a/alib2measure/src/measurements/MeasurementTypes.cpp b/alib2measure/src/measurements/MeasurementTypes.cpp
index 7ff2e34e45..689efd07c3 100644
--- a/alib2measure/src/measurements/MeasurementTypes.cpp
+++ b/alib2measure/src/measurements/MeasurementTypes.cpp
@@ -2,7 +2,7 @@
* Author: Radovan Cerveny
*/
#include "MeasurementTypes.hpp"
-#include <exception/CommonException.h>
+#include <stdexcept>
namespace measurements {
@@ -33,7 +33,7 @@ std::string to_string ( Type t ) {
return "ALGORITHM";
}
- throw::exception::CommonException ( "Missing case." );
+ throw std::invalid_argument ( "Missing case." );
}
Type measurementTypeFromString ( const std::string & ts ) {
@@ -53,7 +53,7 @@ Type measurementTypeFromString ( const std::string & ts ) {
if ( ts == "ALGORITHM" ) return Type::ALGORITHM;
- throw::exception::CommonException ( "measurementTypeFromString failed, unknown measurement type: " + ts );
+ throw std::invalid_argument ( "measurementTypeFromString failed, unknown measurement type: " + ts );
}
std::ostream & operator <<( std::ostream & os, Type t ) {
diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.cpp b/alib2measure/src/measurements/frames/CounterDataFrame.cpp
index abaf9c52ae..a2c7f2dcb6 100644
--- a/alib2measure/src/measurements/frames/CounterDataFrame.cpp
+++ b/alib2measure/src/measurements/frames/CounterDataFrame.cpp
@@ -48,7 +48,7 @@ void CounterDataFrame::hint ( unsigned frameIdx, measurements::stealth_vector <
}
}
-CounterDataFrame CounterDataFrame::aggregate ( const ext::vector < MeasurementFrame > & framesToAggregate ) {
+CounterDataFrame CounterDataFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
// FIXME dummmy aggregation
return framesToAggregate[0].counter;
}
diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.hpp b/alib2measure/src/measurements/frames/CounterDataFrame.hpp
index da404c2e45..acbb520313 100644
--- a/alib2measure/src/measurements/frames/CounterDataFrame.hpp
+++ b/alib2measure/src/measurements/frames/CounterDataFrame.hpp
@@ -33,7 +33,7 @@ struct CounterDataFrame {
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void hint ( unsigned, measurements::stealth_vector < MeasurementFrame > &, CounterHint );
- static CounterDataFrame aggregate ( const ext::vector < MeasurementFrame > & );
+ static CounterDataFrame aggregate ( const std::vector < MeasurementFrame > & );
};
std::ostream & operator <<( std::ostream &, const CounterDataFrame & );
diff --git a/alib2measure/src/measurements/frames/MemoryDataFrame.cpp b/alib2measure/src/measurements/frames/MemoryDataFrame.cpp
index 2d57ccc3cc..c0dcb5fbde 100644
--- a/alib2measure/src/measurements/frames/MemoryDataFrame.cpp
+++ b/alib2measure/src/measurements/frames/MemoryDataFrame.cpp
@@ -64,7 +64,7 @@ void MemoryDataFrame::hint ( unsigned frameIdx, measurements::stealth_vector < M
}
}
-MemoryDataFrame MemoryDataFrame::aggregate ( const ext::vector < MeasurementFrame > & framesToAggregate ) {
+MemoryDataFrame MemoryDataFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
// FIXME dummmy aggregation
return framesToAggregate[0].memory;
}
diff --git a/alib2measure/src/measurements/frames/MemoryDataFrame.hpp b/alib2measure/src/measurements/frames/MemoryDataFrame.hpp
index 90f833a6a8..c28fe16cc5 100644
--- a/alib2measure/src/measurements/frames/MemoryDataFrame.hpp
+++ b/alib2measure/src/measurements/frames/MemoryDataFrame.hpp
@@ -39,7 +39,7 @@ struct MemoryDataFrame {
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void hint ( unsigned, measurements::stealth_vector < MeasurementFrame > &, MemoryHint );
- static MemoryDataFrame aggregate ( const ext::vector < MeasurementFrame > & );
+ static MemoryDataFrame aggregate ( const std::vector < MeasurementFrame > & );
};
std::ostream & operator <<( std::ostream &, const MemoryDataFrame & );
diff --git a/alib2measure/src/measurements/frames/TimeDataFrame.cpp b/alib2measure/src/measurements/frames/TimeDataFrame.cpp
index 38eea1abe6..81d92709e9 100644
--- a/alib2measure/src/measurements/frames/TimeDataFrame.cpp
+++ b/alib2measure/src/measurements/frames/TimeDataFrame.cpp
@@ -27,7 +27,7 @@ void TimeDataFrame::update ( unsigned frameIdx, measurements::stealth_vector < M
parentFrame.time.inFrameDuration -= currentFrame.time.duration;
}
-TimeDataFrame TimeDataFrame::aggregate ( const ext::vector < MeasurementFrame > & framesToAggregate ) {
+TimeDataFrame TimeDataFrame::aggregate ( const std::vector < MeasurementFrame > & framesToAggregate ) {
TimeDataFrame aggregatedTimeDataFrame = TimeDataFrame ( );
// we want to compute simple average of times
diff --git a/alib2measure/src/measurements/frames/TimeDataFrame.hpp b/alib2measure/src/measurements/frames/TimeDataFrame.hpp
index 21404d048b..1dc3a6335c 100644
--- a/alib2measure/src/measurements/frames/TimeDataFrame.hpp
+++ b/alib2measure/src/measurements/frames/TimeDataFrame.hpp
@@ -24,7 +24,7 @@ struct TimeDataFrame {
static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & );
- static TimeDataFrame aggregate ( const ext::vector < MeasurementFrame > & );
+ static TimeDataFrame aggregate ( const std::vector < MeasurementFrame > & );
};
std::ostream & operator <<( std::ostream &, const std::chrono::microseconds & );
diff --git a/alib2measure/test-src/main.cpp b/alib2measure/test-src/main.cpp
index fd442ebd12..0026f79acd 100644
--- a/alib2measure/test-src/main.cpp
+++ b/alib2measure/test-src/main.cpp
@@ -14,7 +14,7 @@
#include <cppunit/SourceLine.h>
#include <cppunit/Exception.h>
-#include <exception/CommonException.h>
+//#include <exception/CommonException.h>
CPPUNIT_NS_BEGIN
@@ -148,9 +148,9 @@ int main(int argc, char* argv[]) {
xmlOut.write();
return progressListener.getResult();
- } catch(const exception::CommonException& exception) {
+/* } catch(const exception::CommonException& exception) {
std::cerr << exception.getCause() << std::endl;
- return 1;
+ return 1;*/
} catch(const TCLAP::ArgException& exception) {
std::cerr << exception.error() << std::endl;
return 2;
diff --git a/alib2measure/test-src/measurements/MeasurementsTest.cpp b/alib2measure/test-src/measurements/MeasurementsTest.cpp
index 396a2e702a..81a8bada25 100644
--- a/alib2measure/test-src/measurements/MeasurementsTest.cpp
+++ b/alib2measure/test-src/measurements/MeasurementsTest.cpp
@@ -85,10 +85,6 @@ void MeasurementsTest::testTimeMeasurements ( ) {
#endif
void __NO_OPTIMIZE_ATTRIBUTE__ MeasurementsTest::testMemoryMeasurements ( ) {
- #ifndef __clang__
- return
- #endif
-
measurements::start ( "chunk1", measurements::Type::MAIN );
int * baz = new int[500];
measurements::end ( );
@@ -152,7 +148,7 @@ void MeasurementsTest::testCounterMeasurements ( ) {
measurements::end ( );
measurements::end ( );
- ext::map < std::string, int > expectedResults [ ] = {
+ std::map < std::string, int > expectedResults [ ] = {
{ } ,
{ { "test1", 3 } , { "test2", -19 } , { "test3", -3 } , { "test4", -2 } } ,
{ { "test1", 3 } , { "test2", -19 } , { "test3", -3 } , { "test4", -2 } } ,
diff --git a/alib2raw/makefile.conf b/alib2raw/makefile.conf
index 7128162ca0..c644f9c591 100644
--- a/alib2raw/makefile.conf
+++ b/alib2raw/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2raw
TESTBIN:=alib2test
-LINK_PATHS=../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2data alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/alib2str/makefile.conf b/alib2str/makefile.conf
index 490c340ebf..ae5049dd9e 100644
--- a/alib2str/makefile.conf
+++ b/alib2str/makefile.conf
@@ -1,5 +1,5 @@
LIBRARY:=alib2str
TESTBIN:=alib2test
-LINK_PATHS=../alib2data/ ../alib2xml/ ../alib2measure/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2data alib2xml alib2measure alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2data/ ../alib2xml/ ../alib2common/ ../alib2std/ ../alib2measure/
+LINK_LIBRARIES=alib2data alib2xml alib2common alib2std alib2measure xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2xml/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ /usr/include/libxml2/
diff --git a/makefile b/makefile
index 79a5b5abea..6f83ad5494 100644
--- a/makefile
+++ b/makefile
@@ -20,8 +20,8 @@ JOBS := 1
endif
SUBDIRS_LIBS = alib2std \
- alib2common \
alib2measure \
+ alib2common \
alib2xml \
alib2data \
alib2data_experimental \
--
GitLab