diff --git a/aaccess2/src/aaccess.cpp b/aaccess2/src/aaccess.cpp
index d19cb9890cf3e46fa89574305267ea47d3c728c1..7e0eea85142477a3a97bbbffbe98d8a8c3c88fc5 100644
--- a/aaccess2/src/aaccess.cpp
+++ b/aaccess2/src/aaccess.cpp
@@ -208,7 +208,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/aarbology2/src/aarbology.cpp b/aarbology2/src/aarbology.cpp
index d989661f9f86d04733e7b789552bd809936178da..bc57a2e34005e5b67268cae689fe54314da33a81 100644
--- a/aarbology2/src/aarbology.cpp
+++ b/aarbology2/src/aarbology.cpp
@@ -344,7 +344,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/acast2/src/acast.cpp b/acast2/src/acast.cpp
index 6fe5f611fa2e42c4c7b03a46d7bebe72133c346e..f7389b8362267b31261ea0f2cba5759b41a2b7d3 100644
--- a/acast2/src/acast.cpp
+++ b/acast2/src/acast.cpp
@@ -73,7 +73,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch(const exception::CommonException& exception) {
diff --git a/acompaction2/src/acompaction.cpp b/acompaction2/src/acompaction.cpp
index 5caa4eed45c78dac52f2cd7e3adc5e3e4ed9791b..ca424e4d40fec644c409af58bb45a4829c177f5d 100644
--- a/acompaction2/src/acompaction.cpp
+++ b/acompaction2/src/acompaction.cpp
@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch (const exception::CommonException& exception) {
diff --git a/aconversions2/src/aconversion.cpp b/aconversions2/src/aconversion.cpp
index 5c11ae9415d6e28cbf788d57d57d7a9bd856f3d6..30271d92e7706ba181e0162c3c87e3a3b7204135 100644
--- a/aconversions2/src/aconversion.cpp
+++ b/aconversions2/src/aconversion.cpp
@@ -64,7 +64,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch(const exception::CommonException& exception) {
diff --git a/aconvert2/src/aconvert.cpp b/aconvert2/src/aconvert.cpp
index 3d186bca640b85f8c81ee0ab3eaf5e40306733ba..1fb43ace5827f5e38fb444cb7a730e7fab3fe40e 100644
--- a/aconvert2/src/aconvert.cpp
+++ b/aconvert2/src/aconvert.cpp
@@ -251,7 +251,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/aderivation2/src/aderivation.cpp b/aderivation2/src/aderivation.cpp
index a8cde56f70ea6f79654c3a5bbf2f90476a6f58ac..fc5996aa6959251a4aa41a97eefd83fa5cc5acce 100644
--- a/aderivation2/src/aderivation.cpp
+++ b/aderivation2/src/aderivation.cpp
@@ -59,7 +59,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch(const exception::CommonException& exception) {
diff --git a/adeterminize2/src/adeterminize.cpp b/adeterminize2/src/adeterminize.cpp
index f48b8d6db84b077cb1f4d43ab38c8b81d1a0c151..09027562ced5ce7c374dc5675018f30d79282483 100644
--- a/adeterminize2/src/adeterminize.cpp
+++ b/adeterminize2/src/adeterminize.cpp
@@ -56,7 +56,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch (const exception::CommonException& exception) {
diff --git a/aecho2/src/aecho.cpp b/aecho2/src/aecho.cpp
index 8b01989f59941048504e9800466ed727a62de4c3..d0a15676c27608c701dccbcf68934fd5fd08fe17 100644
--- a/aecho2/src/aecho.cpp
+++ b/aecho2/src/aecho.cpp
@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch(const exception::CommonException& exception) {
diff --git a/aepsilon2/src/aepsilon.cpp b/aepsilon2/src/aepsilon.cpp
index d465c5b5f584e1fae54759a2c1bb5b054d369425..f9c204937a92e2cf7b8bd5b18ff4e2cdc950f6ce 100644
--- a/aepsilon2/src/aepsilon.cpp
+++ b/aepsilon2/src/aepsilon.cpp
@@ -140,7 +140,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch (const exception::CommonException& exception) {
diff --git a/agenerate2/src/agenerate.cpp b/agenerate2/src/agenerate.cpp
index 93913c187c13810cdacee087c307f0ad1c9ed82a..46e84fa04121436b6020f7cf5a95498aa4857c5f 100644
--- a/agenerate2/src/agenerate.cpp
+++ b/agenerate2/src/agenerate.cpp
@@ -93,7 +93,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/aintegral2/src/aintegral.cpp b/aintegral2/src/aintegral.cpp
index 5efa84c472a5461238fe8ec5243923e46e20cd5f..0fc59e9867dfdaa477d7acdf4a7f2386385ba638 100644
--- a/aintegral2/src/aintegral.cpp
+++ b/aintegral2/src/aintegral.cpp
@@ -59,7 +59,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch(const exception::CommonException& exception) {
diff --git a/aintrospection2/src/aintrospection.cpp b/aintrospection2/src/aintrospection.cpp
index aa753976e7457a5822216d807dbad9b3a7099ca7..6b791b4f1d4fe6f042a63b81c383b050887dd5a1 100644
--- a/aintrospection2/src/aintrospection.cpp
+++ b/aintrospection2/src/aintrospection.cpp
@@ -112,7 +112,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/alangop2/src/alangop.cpp b/alangop2/src/alangop.cpp
index 3eaaa680067dcd347a3bb4df2f2920914ca503e1..c7be76a61f9965c1e6bbcf3d0193a379e14bdbfe 100644
--- a/alangop2/src/alangop.cpp
+++ b/alangop2/src/alangop.cpp
@@ -157,7 +157,7 @@ int main(int argc, char* argv[]) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch( const exception::CommonException & exception ) {
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
index 095b398f4bcef114ec0384b8319193e91fcfe745..a8e3dd7c23280e13c6b2df515a279e6058951fd4 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
@@ -92,7 +92,7 @@ MPRPipelineResult MeasurementProvisioner::runPipeline ( const MPPipeline & pipel
// setup environment for pipeline running
PipelineRunnerEnvironment pre;
- std::ofdstream ofdlog ( pre.stderrFd );
+ ext::ofdstream ofdlog ( pre.stderrFd );
std::vector < std::vector < MeasurementResults > > commandMeasurementSubResults;
@@ -278,7 +278,7 @@ void MeasurementProvisioner::PipelineRunnerEnvironment::commandFdEnd ( ) {
std::string MeasurementProvisioner::PipelineRunnerEnvironment::retrievePipelineError ( ) {
// rewind stderr to read the error message
lseek ( 2, 0, SEEK_SET );
- std::ifdstream errfds ( 2 );
+ ext::ifdstream errfds ( 2 );
// read the whole stderr
std::stringstream buffer;
@@ -297,7 +297,7 @@ MeasurementResults MeasurementProvisioner::PipelineRunnerEnvironment::retrieveMe
// since we are at the end of file after the measurements, we need to rewind
lseek ( measurementsFd, 0, SEEK_SET );
- std::ifdstream ifd ( measurementsFd );
+ ext::ifdstream ifd ( measurementsFd );
std::deque < sax::Token > tokens;
sax::SaxParseInterface::parseStream ( ifd, tokens );
diff --git a/alib2std/src/extensions/fdstream.cpp b/alib2std/src/extensions/fdstream.cpp
index fce56654ad3374f5bfd5b2ad79d3f8284700a15b..ed7b0f16cc3cc7dd0b6003f6e729d3202f10300c 100644
--- a/alib2std/src/extensions/fdstream.cpp
+++ b/alib2std/src/extensions/fdstream.cpp
@@ -7,7 +7,7 @@
#include <fdstream>
-namespace std {
+namespace ext {
const int FAIL_FD = -1;
@@ -124,4 +124,4 @@ bool ifdstream::is_redirected ( ) const {
return fda.is_redirected ( );
}
-} /* namespace std */
+} /* namespace ext */
diff --git a/alib2std/src/extensions/fdstream.hpp b/alib2std/src/extensions/fdstream.hpp
index a25bda8eadc7b200673e3a3946725d1e13bb40fa..001892676b0bbad68bf75b653d7cf26ea0ee7fbe 100644
--- a/alib2std/src/extensions/fdstream.hpp
+++ b/alib2std/src/extensions/fdstream.hpp
@@ -26,7 +26,7 @@
#include <istream>
#include <array>
-namespace std {
+namespace ext {
extern const int FAIL_FD;
@@ -82,6 +82,6 @@ public:
bool is_redirected ( ) const;
};
-} /* namespace std */
+} /* namespace ext */
#endif /* __FDSTREAM_HPP_ */
diff --git a/alib2std/src/extensions/iostream.cpp b/alib2std/src/extensions/iostream.cpp
index 7e9165729206a896f0eb11ffd146783d9a74f068..be630032f8c91f70b24986c17127a2ec8c111ab2 100644
--- a/alib2std/src/extensions/iostream.cpp
+++ b/alib2std/src/extensions/iostream.cpp
@@ -7,7 +7,7 @@
#include <iostream>
-namespace std {
+namespace ext {
const int CERR_FD = 2;
@@ -33,4 +33,4 @@ RelinkIO::~RelinkIO ( ) {
RelinkIO relinkio;
-} /* namespace std */
+} /* namespace ext */
diff --git a/alib2std/src/extensions/iostream.hpp b/alib2std/src/extensions/iostream.hpp
index 1edf7adbe82ecff844d244e2d6ce2efa6c2d7774..55d82be0c8527b50b8147554e2dfb64ad5dbcb51 100644
--- a/alib2std/src/extensions/iostream.hpp
+++ b/alib2std/src/extensions/iostream.hpp
@@ -13,7 +13,7 @@
#include "fdstream.hpp"
-namespace std {
+namespace ext {
extern const int CERR_FD;
@@ -33,6 +33,6 @@ public:
// following the way of stdlibc++
extern RelinkIO relinkio;
-} /* namespace std */
+} /* namespace ext */
#endif /* __IOSTREAM_HPP_ */
diff --git a/aminimize2/src/aminimize.cpp b/aminimize2/src/aminimize.cpp
index 62a94a7080a32d2936127d3804fbffcc3cee893a..ba95aa1d384bb4b157c11e790ddc712333d3585a 100644
--- a/aminimize2/src/aminimize.cpp
+++ b/aminimize2/src/aminimize.cpp
@@ -73,7 +73,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch (const exception::CommonException& exception) {
diff --git a/anormalize2/src/anormalize.cpp b/anormalize2/src/anormalize.cpp
index fe55ec4247909a5014c3c8de4feaa8c17e394fac..9f6147b52cfc5b170b6993d55188716c5e5bb6ae 100644
--- a/anormalize2/src/anormalize.cpp
+++ b/anormalize2/src/anormalize.cpp
@@ -189,7 +189,7 @@ int main ( int argc, char * * argv ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/aql2/src/aql.cpp b/aql2/src/aql.cpp
index 1b59991f0a46bbf541ee30c9d87fc076c111c7d5..0a8b6433254ae21a5d3a1918761695e0706de64d 100644
--- a/aql2/src/aql.cpp
+++ b/aql2/src/aql.cpp
@@ -91,7 +91,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
if ( measure.getValue ( ) )
- std::cmeasure << measurements::results ( ) << std::endl;
+ ext::cmeasure << measurements::results ( ) << std::endl;
if ( result == cli::Command::Result::QUIT )
return 0;
diff --git a/aquery2/src/aquery.cpp b/aquery2/src/aquery.cpp
index 7fb257491bdf77a349a95ba1c43dc0efac73f829..5ffe4eed3277293cfbc35ec472e1f48c21602912 100644
--- a/aquery2/src/aquery.cpp
+++ b/aquery2/src/aquery.cpp
@@ -178,7 +178,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/arand2/src/arand.cpp b/arand2/src/arand.cpp
index acc0ad2f9ff43f18125b3bca01160f24f6c18ea5..985bcf8971a1d770ff117189f90c0848f931e4dd 100644
--- a/arand2/src/arand.cpp
+++ b/arand2/src/arand.cpp
@@ -239,7 +239,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/araw2/src/araw.cpp b/araw2/src/araw.cpp
index b5943fe225ad41bb5bc3c96772a920e089d3f736..5406b15dd93bdaec920edd3c3c577a2255966f0d 100644
--- a/araw2/src/araw.cpp
+++ b/araw2/src/araw.cpp
@@ -118,7 +118,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch(const exception::CommonException& exception) {
diff --git a/arename2/src/arename.cpp b/arename2/src/arename.cpp
index 7738c376cd430f3370dffa6f24f2920b3742d3e9..c63af615a47d8b69aa36159c34ea447b1d7fd0b9 100644
--- a/arename2/src/arename.cpp
+++ b/arename2/src/arename.cpp
@@ -75,7 +75,7 @@ int main ( int argc, char * * argv ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/areverse2/src/areverse.cpp b/areverse2/src/areverse.cpp
index 6b72d9e7e8f660c951bb34758fd8ead11d468293..8cd69faeaa7fc2213590483e731d652bd8510319 100644
--- a/areverse2/src/areverse.cpp
+++ b/areverse2/src/areverse.cpp
@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch (const exception::CommonException& exception) {
diff --git a/arun2/src/arun.cpp b/arun2/src/arun.cpp
index adb7e669271c1753ad8ef9ccf3d914f93b47a0e1..6fd61b1fade2b25b8e841094ce11a1dddfbe35cf 100644
--- a/arun2/src/arun.cpp
+++ b/arun2/src/arun.cpp
@@ -117,7 +117,7 @@ int main(int argc, char* argv[]) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/astat2/src/astat.cpp b/astat2/src/astat.cpp
index 036f3fb567d535ed7c9f32621204b50a5b59a41e..48abe8137458517a370bb07031b8e3e2dbf106ed 100644
--- a/astat2/src/astat.cpp
+++ b/astat2/src/astat.cpp
@@ -77,7 +77,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/astringology2/src/astringology.cpp b/astringology2/src/astringology.cpp
index eb0bfe8ea486b7c9e8425f233e6643cd4b74b3ce..2d35ab4113eb3a4ee9a028de2ecc6a3394aba317 100644
--- a/astringology2/src/astringology.cpp
+++ b/astringology2/src/astringology.cpp
@@ -410,7 +410,7 @@ int main ( int argc, char * argv[] ) {
measurements::end ( );
measurements::end ( );
- if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl;
+ if ( measure.getValue ( ) ) ext::cmeasure << measurements::results ( ) << std::endl;
return 0;
} catch ( const exception::CommonException & exception ) {
diff --git a/atrim2/src/atrim.cpp b/atrim2/src/atrim.cpp
index cce17143a26494a0ead90b8956be3dbf0849ba2b..3fef540d9e82ba504c46b3a15e692b8e357b229b 100644
--- a/atrim2/src/atrim.cpp
+++ b/atrim2/src/atrim.cpp
@@ -150,7 +150,7 @@ int main(int argc, char* argv[]) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch( const exception::CommonException & exception ) {
diff --git a/tniceprint/src/tniceprint.cpp b/tniceprint/src/tniceprint.cpp
index 760b6fd31200db9c9d1bb76e392792f4289a37a3..5d131d8551683c83626257e0e8d52cb6197eb375 100644
--- a/tniceprint/src/tniceprint.cpp
+++ b/tniceprint/src/tniceprint.cpp
@@ -65,7 +65,7 @@ int main(int argc, char** argv) {
measurements::end();
measurements::end();
- if(measure.getValue()) std::cmeasure << measurements::results() << std::endl;
+ if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;
return 0;
} catch(const exception::CommonException& exception) {