Merge pull request #4426

40a158e minor code format fix in rpc-related files (Philip Kaufmann)
TrezarCoin · Jun 27, 2014 · 3a9d796 · 3a9d796
2 parents 49d86c7 + 40a158e
commit 3a9d796
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
@@ -22,10 +22,10 @@
 #include "json/json_spirit_utils.h"
 #include "json/json_spirit_value.h"
 
-using namespace std;
 using namespace boost;
 using namespace boost::assign;
 using namespace json_spirit;
+using namespace std;
 
 Value getinfo(const Array& params, bool fHelp)
 {

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
@@ -25,10 +25,10 @@
 #include <boost/shared_ptr.hpp>
 #include "json/json_spirit_writer_template.h"
 
-using namespace std;
 using namespace boost;
 using namespace boost::asio;
 using namespace json_spirit;
+using namespace std;
 
 static std::string strRPCUserColonPass;
 
@@ -897,9 +897,7 @@ void ServiceConnection(AcceptedConnection *conn)
         if (strURI == "/") {
             if (!HTTPReq_JSONRPC(conn, strRequest, mapHeaders, fRun))
                 break;
-        }
-
-        else {
+        } else {
             conn->stream() << HTTPReply(HTTP_NOT_FOUND, "", false) << std::flush;
             break;
         }