From 38dacf114b82b027fe6a01cd092000b585e750b6 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sun, 6 Aug 2017 07:50:37 +0200
Subject: [PATCH] move relinkIP and fdstreams to namespace ext;
---
aaccess2/src/aaccess.cpp | 2 +-
aarbology2/src/aarbology.cpp | 2 +-
acast2/src/acast.cpp | 2 +-
acompaction2/src/acompaction.cpp | 2 +-
aconversions2/src/aconversion.cpp | 2 +-
aconvert2/src/aconvert.cpp | 2 +-
aderivation2/src/aderivation.cpp | 2 +-
adeterminize2/src/adeterminize.cpp | 2 +-
aecho2/src/aecho.cpp | 2 +-
aepsilon2/src/aepsilon.cpp | 2 +-
agenerate2/src/agenerate.cpp | 2 +-
aintegral2/src/aintegral.cpp | 2 +-
aintrospection2/src/aintrospection.cpp | 2 +-
alangop2/src/alangop.cpp | 2 +-
alib2measurepp/src/provisioner/MeasurementProvisioner.cpp | 6 +++---
alib2std/src/extensions/fdstream.cpp | 4 ++--
alib2std/src/extensions/fdstream.hpp | 4 ++--
alib2std/src/extensions/iostream.cpp | 4 ++--
alib2std/src/extensions/iostream.hpp | 4 ++--
aminimize2/src/aminimize.cpp | 2 +-
anormalize2/src/anormalize.cpp | 2 +-
aql2/src/aql.cpp | 2 +-
aquery2/src/aquery.cpp | 2 +-
arand2/src/arand.cpp | 2 +-
araw2/src/araw.cpp | 2 +-
arename2/src/arename.cpp | 2 +-
areverse2/src/areverse.cpp | 2 +-
arun2/src/arun.cpp | 2 +-
astat2/src/astat.cpp | 2 +-
astringology2/src/astringology.cpp | 2 +-
atrim2/src/atrim.cpp | 2 +-
tniceprint/src/tniceprint.cpp | 2 +-
32 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/aaccess2/src/aaccess.cpp b/aaccess2/src/aaccess.cpp
index d19cb9890c..7e0eea8514 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 d989661f9f..bc57a2e340 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 6fe5f611fa..f7389b8362 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 5caa4eed45..ca424e4d40 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 5c11ae9415..30271d92e7 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 3d186bca64..1fb43ace58 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 a8cde56f70..fc5996aa69 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 f48b8d6db8..09027562ce 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 8b01989f59..d0a15676c2 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 d465c5b5f5..f9c204937a 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 93913c187c..46e84fa041 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 5efa84c472..0fc59e9867 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 aa753976e7..6b791b4f1d 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 3eaaa68006..c7be76a61f 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 095b398f4b..a8e3dd7c23 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 fce56654ad..ed7b0f16cc 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 a25bda8ead..001892676b 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 7e91657292..be630032f8 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 1edf7adbe8..55d82be0c8 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 62a94a7080..ba95aa1d38 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 fe55ec4247..9f6147b52c 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 1b59991f0a..0a8b643325 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 7fb257491b..5ffe4eed32 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 acc0ad2f9f..985bcf8971 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 b5943fe225..5406b15dd9 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 7738c376cd..c63af615a4 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 6b72d9e7e8..8cd69faeaa 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 adb7e66927..6fd61b1fad 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 036f3fb567..48abe81374 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 eb0bfe8ea4..2d35ab4113 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 cce17143a2..3fef540d9e 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 760b6fd312..5d131d8551 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) {
--
GitLab