make measurements library independent from std ext

alib2algo/makefile.conf

 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/

alib2algo_experimental/makefile.conf

 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/

alib2aux/makefile.conf

 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/

alib2cli/makefile.conf

 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/

alib2common/makefile.conf

 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/

alib2data/makefile.conf

 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/

alib2data_experimental/makefile.conf

 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/

alib2elgo/makefile.conf

 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/

alib2measure/makefile.conf

 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=

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_ */

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

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 ( );

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;

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 & );

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] );

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;

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 ) {

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;
 }

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 & );

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;
 }