From fbddf29b719cd610b01b2459c4827d636cda6c73 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 9 Sep 2009 19:46:56 +0000 Subject: Tidied up namespace usage Miscelleneous whitespace fixes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813094 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ForkedBroker.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'cpp/src/tests/ForkedBroker.cpp') diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp index 30c346850c..e1a96c8e90 100644 --- a/cpp/src/tests/ForkedBroker.cpp +++ b/cpp/src/tests/ForkedBroker.cpp @@ -30,6 +30,16 @@ using namespace std; using qpid::ErrnoException; +namespace std { +static ostream& operator<<(ostream& o, const qpid::tests::ForkedBroker::Args& a) { +copy(a.begin(), a.end(), ostream_iterator(o, " ")); +return o; +} +} + +namespace qpid { +namespace tests { + ForkedBroker::ForkedBroker(const Args& constArgs) { Args args(constArgs); Args::iterator i = find(args.begin(), args.end(), string("TMP_DATA_DIR")); @@ -71,12 +81,6 @@ void ForkedBroker::kill(int sig) { throw qpid::Exception(QPID_MSG("Forked broker exited with: " << WEXITSTATUS(status))); } -namespace std { -static ostream& operator<<(ostream& o, const ForkedBroker::Args& a) { - copy(a.begin(), a.end(), ostream_iterator(o, " ")); - return o; -} - bool isLogOption(const std::string& s) { const char * log_enable = "--log-enable", * trace = "--trace"; @@ -85,8 +89,6 @@ bool isLogOption(const std::string& s) { ); } -} - void ForkedBroker::init(const Args& userArgs) { using qpid::ErrnoException; port = 0; @@ -125,3 +127,5 @@ void ForkedBroker::init(const Args& userArgs) { ::exit(1); } } + +}} // namespace qpid::tests -- cgit v1.2.1