Skip to content
Snippets Groups Projects
Commit 38dacf11 authored by Jan Trávníček's avatar Jan Trávníček
Browse files

move relinkIP and fdstreams to namespace ext;

parent d865f290
No related branches found
No related tags found
No related merge requests found
Pipeline #
Showing
with 26 additions and 26 deletions
......@@ -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 ) {
......
......@@ -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 ) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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 ) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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 ) {
......
......@@ -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) {
......
......@@ -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 ) {
......
......@@ -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 ) {
......
......@@ -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 );
......
......@@ -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 */
......@@ -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_ */
......@@ -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 */
......@@ -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_ */
......@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment