summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2012-03-22 18:51:28 +0000
committerAndrew Stitcher <astitcher@apache.org>2012-03-22 18:51:28 +0000
commit0e03eaaa991f58c5d52cf9eb5ae8d763672a1e57 (patch)
treea121a1ac3e7dc928c43b62c9d8ca280ab5d5cf19
parentde67f71f7c493c6de00695130bf1fb06e4fc3f49 (diff)
downloadqpid-python-0e03eaaa991f58c5d52cf9eb5ae8d763672a1e57.tar.gz
NO-JIRA: Remove some namespace polluting "using namespace boost" declarations
- Blanket "using namespace" declarations like these are BAD, they can change the symbols imported into your namespace and you have no control over this. - Needed to make QPID-3893 compile on windows git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1303980 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/cluster/ClusterMap.cpp3
-rw-r--r--qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp2
-rw-r--r--qpid/cpp/src/qpid/framing/BodyHandler.cpp6
-rw-r--r--qpid/cpp/src/qpid/framing/FrameSet.cpp1
-rw-r--r--qpid/cpp/src/tests/Frame.cpp1
-rw-r--r--qpid/cpp/src/tests/SessionState.cpp1
-rw-r--r--qpid/cpp/src/tests/logging.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/qpid/cpp/src/qpid/cluster/ClusterMap.cpp b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
index a8389095c9..12730d20ec 100644
--- a/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
+++ b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
@@ -29,7 +29,8 @@
#include <ostream>
using namespace std;
-using namespace boost;
+using boost::ref;
+using boost::optional;
namespace qpid {
using namespace framing;
diff --git a/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp b/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
index eb65005a9e..fc53d1076b 100644
--- a/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
+++ b/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
@@ -30,9 +30,9 @@ namespace qpid {
namespace cluster {
using namespace std;
-using namespace boost;
using namespace framing::cluster;
using namespace framing;
+using boost::optional;
InitialStatusMap::InitialStatusMap(const MemberId& self_, size_t size_)
: self(self_), completed(), resendNeeded(), size(size_)
diff --git a/qpid/cpp/src/qpid/framing/BodyHandler.cpp b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
index db302b1e4c..5ac9d84717 100644
--- a/qpid/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
@@ -19,16 +19,18 @@
*
*/
#include "qpid/framing/BodyHandler.h"
+
#include "qpid/framing/AMQMethodBody.h"
#include "qpid/framing/AMQHeaderBody.h"
#include "qpid/framing/AMQContentBody.h"
#include "qpid/framing/AMQHeartbeatBody.h"
-#include <boost/cast.hpp>
#include "qpid/framing/reply_exceptions.h"
#include "qpid/Msg.h"
+#include <boost/cast.hpp>
+
using namespace qpid::framing;
-using namespace boost;
+using boost::polymorphic_downcast;
BodyHandler::~BodyHandler() {}
diff --git a/qpid/cpp/src/qpid/framing/FrameSet.cpp b/qpid/cpp/src/qpid/framing/FrameSet.cpp
index 255aaf6e6b..d2612e484f 100644
--- a/qpid/cpp/src/qpid/framing/FrameSet.cpp
+++ b/qpid/cpp/src/qpid/framing/FrameSet.cpp
@@ -26,7 +26,6 @@
#include "qpid/framing/TypeFilter.h"
using namespace qpid::framing;
-using namespace boost;
FrameSet::FrameSet(const SequenceNumber& _id) : id(_id),contentSize(0),recalculateSize(true) { }
FrameSet::FrameSet(const FrameSet& original) : id(original.id), contentSize(0), recalculateSize(true)
diff --git a/qpid/cpp/src/tests/Frame.cpp b/qpid/cpp/src/tests/Frame.cpp
index 1270eabba3..cfcfde04a7 100644
--- a/qpid/cpp/src/tests/Frame.cpp
+++ b/qpid/cpp/src/tests/Frame.cpp
@@ -30,7 +30,6 @@ QPID_AUTO_TEST_SUITE(FrameTestSuite)
using namespace std;
using namespace qpid::framing;
-using namespace boost;
QPID_AUTO_TEST_CASE(testContentBody) {
Frame f(42, AMQContentBody("foobar"));
diff --git a/qpid/cpp/src/tests/SessionState.cpp b/qpid/cpp/src/tests/SessionState.cpp
index 3be9bb0cbc..1cf3415484 100644
--- a/qpid/cpp/src/tests/SessionState.cpp
+++ b/qpid/cpp/src/tests/SessionState.cpp
@@ -34,7 +34,6 @@ namespace tests {
QPID_AUTO_TEST_SUITE(SessionStateTestSuite)
using namespace std;
-using namespace boost;
using namespace qpid::framing;
// ================================================================
diff --git a/qpid/cpp/src/tests/logging.cpp b/qpid/cpp/src/tests/logging.cpp
index fc55d642c3..66371fa8c5 100644
--- a/qpid/cpp/src/tests/logging.cpp
+++ b/qpid/cpp/src/tests/logging.cpp
@@ -43,8 +43,8 @@ namespace tests {
QPID_AUTO_TEST_SUITE(loggingTestSuite)
using namespace std;
-using namespace boost;
using namespace qpid::log;
+using boost::format;
QPID_AUTO_TEST_CASE(testStatementInit) {
Statement s=QPID_LOG_STATEMENT_INIT(debug); int line=__LINE__;