Author: astitcher
Date: Thu Mar 15 19:40:08 2012
New Revision: 1301168
URL: http://svn.apache.org/viewvc?rev=1301168&view=rev
Log:
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
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp
qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp
qpid/trunk/qpid/cpp/src/tests/Frame.cpp
qpid/trunk/qpid/cpp/src/tests/SessionState.cpp
qpid/trunk/qpid/cpp/src/tests/logging.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.cpp Thu Mar 15 19:40:08 2012
@@ -29,7 +29,8 @@
#include <ostream>
using namespace std;
-using namespace boost;
+using boost::ref;
+using boost::optional;
namespace qpid {
using namespace framing;
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp Thu Mar 15
19:40:08 2012
@@ -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_)
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp Thu Mar 15 19:40:08
2012
@@ -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() {}
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp Thu Mar 15 19:40:08 2012
@@ -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)
Modified: qpid/trunk/qpid/cpp/src/tests/Frame.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Frame.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Frame.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Frame.cpp Thu Mar 15 19:40:08 2012
@@ -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"));
Modified: qpid/trunk/qpid/cpp/src/tests/SessionState.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/SessionState.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/SessionState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/SessionState.cpp Thu Mar 15 19:40:08 2012
@@ -34,7 +34,6 @@ namespace tests {
QPID_AUTO_TEST_SUITE(SessionStateTestSuite)
using namespace std;
-using namespace boost;
using namespace qpid::framing;
// ================================================================
Modified: qpid/trunk/qpid/cpp/src/tests/logging.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/logging.cpp?rev=1301168&r1=1301167&r2=1301168&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/logging.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/logging.cpp Thu Mar 15 19:40:08 2012
@@ -44,8 +44,10 @@ namespace tests {
QPID_AUTO_TEST_SUITE(loggingTestSuite)
using namespace std;
-using namespace boost;
using namespace qpid::log;
+using boost::ends_with;
+using boost::contains;
+using boost::format;
QPID_AUTO_TEST_CASE(testStatementInit) {
Statement s=QPID_LOG_STATEMENT_INIT(debug); int line=__LINE__;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
