diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-03-15 19:40:08 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-03-15 19:40:08 +0000 |
| commit | 948454b7018b35096ae0454c1260dc69244d9946 (patch) | |
| tree | 99fd61f58d641f4f1e0f45326e78996bd5cdab38 /cpp/src/qpid | |
| parent | c421c9f947ff9e75234e58fe3f67309cb41a411b (diff) | |
| download | qpid-python-948454b7018b35096ae0454c1260dc69244d9946.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/trunk/qpid@1301168 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/cluster/ClusterMap.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/InitialStatusMap.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/framing/BodyHandler.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/qpid/framing/FrameSet.cpp | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/cpp/src/qpid/cluster/ClusterMap.cpp index a8389095c9..12730d20ec 100644 --- a/cpp/src/qpid/cluster/ClusterMap.cpp +++ b/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/cpp/src/qpid/cluster/InitialStatusMap.cpp b/cpp/src/qpid/cluster/InitialStatusMap.cpp index eb65005a9e..fc53d1076b 100644 --- a/cpp/src/qpid/cluster/InitialStatusMap.cpp +++ b/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/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp index db302b1e4c..5ac9d84717 100644 --- a/cpp/src/qpid/framing/BodyHandler.cpp +++ b/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/cpp/src/qpid/framing/FrameSet.cpp b/cpp/src/qpid/framing/FrameSet.cpp index 255aaf6e6b..d2612e484f 100644 --- a/cpp/src/qpid/framing/FrameSet.cpp +++ b/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) |
