Merge pull request #4426

40a158e minor code format fix in rpc-related files (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-06-27 12:34:18 +02:00
commit 3a9d796eb9
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 3 additions and 5 deletions

View File

@ -22,10 +22,10 @@
#include "json/json_spirit_utils.h" #include "json/json_spirit_utils.h"
#include "json/json_spirit_value.h" #include "json/json_spirit_value.h"
using namespace std;
using namespace boost; using namespace boost;
using namespace boost::assign; using namespace boost::assign;
using namespace json_spirit; using namespace json_spirit;
using namespace std;
Value getinfo(const Array& params, bool fHelp) Value getinfo(const Array& params, bool fHelp)
{ {

View File

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