From 49340de0cd060035e35cf4cd90ead81b9b93dae2 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Thu, 27 Jun 2013 14:46:00 -0700
Subject: [PATCH] Remove using-namespace-directives at global scope

---
 TODO.txt                    |  7 -------
 src/cpp/ripple/PeerDoor.cpp |  5 +----
 src/cpp/ripple/RPCDoor.cpp  | 11 +++++------
 src/cpp/ripple/main.cpp     |  9 +++++----
 src/cpp/ripple/rpc.cpp      |  7 +------
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 6df6f5256..9b2f40516 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,13 +4,6 @@ TODO
 
 - Remove "ENABLE_INSECURE" when the time is right.
 
-- Put all the Ripple code in the ripple namespace
-  * boost unit tests create namespace problems
-
-- Remove references to BEASTApplication
-
-- Remove "using namespace" statements
-
 - lift bind, function, and placeholders into ripple namespace
 - lift beast into the ripple namespace, remove ripple's duplicated integer types
 - lift unique_ptr / auto_ptr into ripple namespace, or replace with ScopedPointer
diff --git a/src/cpp/ripple/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp
index 808fa08ae..df2b69bd7 100644
--- a/src/cpp/ripple/PeerDoor.cpp
+++ b/src/cpp/ripple/PeerDoor.cpp
@@ -6,12 +6,9 @@
 
 SETUP_LOG (PeerDoor)
 
-using namespace std;
-using namespace boost::asio::ip;
-
 PeerDoor::PeerDoor (boost::asio::io_service& io_service) :
     mAcceptor (io_service,
-               tcp::endpoint (address ().from_string (theConfig.PEER_IP.empty () ? "0.0.0.0" : theConfig.PEER_IP),
+               boost::asio::ip::tcp::endpoint (boost::asio::ip::address ().from_string (theConfig.PEER_IP.empty () ? "0.0.0.0" : theConfig.PEER_IP),
                               theConfig.PEER_PORT)),
     mCtx (boost::asio::ssl::context::sslv23), mDelayTimer (io_service)
 {
diff --git a/src/cpp/ripple/RPCDoor.cpp b/src/cpp/ripple/RPCDoor.cpp
index f27208ca2..dd460bd6f 100644
--- a/src/cpp/ripple/RPCDoor.cpp
+++ b/src/cpp/ripple/RPCDoor.cpp
@@ -6,15 +6,14 @@
 
 SETUP_LOG (RPCDoor)
 
-using namespace std;
-using namespace boost::asio::ip;
-
 extern void initSSLContext (boost::asio::ssl::context& context,
                             std::string key_file, std::string cert_file, std::string chain_file);
 
-RPCDoor::RPCDoor (boost::asio::io_service& io_service) :
-    mAcceptor (io_service, tcp::endpoint (address::from_string (theConfig.RPC_IP), theConfig.RPC_PORT)),
-    mDelayTimer (io_service), mSSLContext (boost::asio::ssl::context::sslv23)
+RPCDoor::RPCDoor (boost::asio::io_service& io_service)
+    : mAcceptor (io_service,
+                 boost::asio::ip::tcp::endpoint (boost::asio::ip::address::from_string (theConfig.RPC_IP), theConfig.RPC_PORT))
+    , mDelayTimer (io_service)
+    , mSSLContext (boost::asio::ssl::context::sslv23)
 {
     WriteLog (lsINFO, RPCDoor) << "RPC port: " << theConfig.RPC_IP << " " << theConfig.RPC_PORT << " allow remote: " << theConfig.RPC_ALLOW_REMOTE;
 
diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp
index 2336f2c83..0d5e1b23a 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -10,9 +10,6 @@ namespace po = boost::program_options;
 extern void TFInit ();
 extern void LEFInit ();
 
-using namespace std;
-using namespace boost::unit_test;
-
 void setupServer ()
 {
     theApp = IApplication::New ();
@@ -56,6 +53,8 @@ bool init_unit_test ()
 
 void printHelp (const po::options_description& desc)
 {
+    using namespace std;
+
     cerr << SYSTEM_NAME "d [options] <command> <params>" << endl;
 
     cerr << desc << endl;
@@ -121,6 +120,8 @@ void printHelp (const po::options_description& desc)
 
 int rippleMain (int argc, char** argv)
 {
+    using namespace std;
+
     setCallingThreadName ("main");
     int                 iResult = 0;
     po::variables_map   vm;                                     // Map of options.
@@ -214,7 +215,7 @@ int rippleMain (int argc, char** argv)
 
     if (vm.count ("unittest"))
     {
-        unit_test_main (init_unit_test, argc, argv);
+        boost::unit_test::unit_test_main (init_unit_test, argc, argv);
 
         return 0;
     }
diff --git a/src/cpp/ripple/rpc.cpp b/src/cpp/ripple/rpc.cpp
index df42e86a3..40fb0b32d 100644
--- a/src/cpp/ripple/rpc.cpp
+++ b/src/cpp/ripple/rpc.cpp
@@ -5,15 +5,10 @@
 //==============================================================================
 
 // Used for logging
-struct RPC
-{
-};
+struct RPC;
 
 SETUP_LOG (RPC)
 
-using namespace boost;
-using namespace boost::asio;
-
 unsigned int const gMaxHTTPHeaderSize = 0x02000000;
 
 std::string gFormatStr ("v1");