aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoinrpc.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-04-11 14:00:48 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-04-11 14:00:48 -0400
commit2232717cba9e9f06a01e8f37bcea4e79ee65205f (patch)
tree5634c4f29b193b973f352edc1db27265bce103e5 /src/bitcoinrpc.cpp
parent37e7e72041686682b1014157dd8a177f65189368 (diff)
downloadbitcoin-2232717cba9e9f06a01e8f37bcea4e79ee65205f.tar.xz
Remove path.make_preferred() calls, and fix compiler error in bitcoinrpc RE: boost::system
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r--src/bitcoinrpc.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 4075c90615..c89552637a 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -2384,7 +2384,7 @@ void ThreadRPCServer2(void* parg)
acceptor.bind(endpoint);
acceptor.listen(socket_base::max_connections);
}
- catch(system::system_error &e)
+ catch(boost::system::system_error &e)
{
ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
_("Error"), wxOK | wxMODAL);
@@ -2399,13 +2399,11 @@ void ThreadRPCServer2(void* parg)
filesystem::path pathCertFile(GetArg("-rpcsslcertificatechainfile", "server.cert"));
if (!pathCertFile.is_complete()) pathCertFile = filesystem::path(GetDataDir()) / pathCertFile;
- pathCertFile.make_preferred();
if (filesystem::exists(pathCertFile)) context.use_certificate_chain_file(pathCertFile.string().c_str());
else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string().c_str());
filesystem::path pathPKFile(GetArg("-rpcsslprivatekeyfile", "server.pem"));
if (!pathPKFile.is_complete()) pathPKFile = filesystem::path(GetDataDir()) / pathPKFile;
- pathPKFile.make_preferred();
if (filesystem::exists(pathPKFile)) context.use_private_key_file(pathPKFile.string().c_str(), ssl::context::pem);
else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());