Remove path.make_preferred() calls, and fix compiler error in bitcoinrpc RE: boost...

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 4075c90..c895526 100644 (file)
--- 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());
 

diff --git a/src/db.cpp b/src/db.cpp
index d47c159..ceae47f 100644 (file)
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -80,10 +80,8 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL)
                 return;
             string strDataDir = GetDataDir();
             filesystem::path pathLogDir(strDataDir + "/database");
-            pathLogDir.make_preferred();
             filesystem::create_directory(pathLogDir);
             filesystem::path pathErrorFile(strDataDir + "/db.log");
-            pathErrorFile.make_preferred();
             printf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str());
 
             int nDbCache = GetArg("-dbcache", 25);
@@ -1179,9 +1177,7 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
 
                 // Copy wallet.dat
                 filesystem::path pathSrc(GetDataDir() + "/" + wallet.strWalletFile);
-                pathSrc.make_preferred();
                 filesystem::path pathDest(strDest);
-                pathDest.make_preferred();
                 if (filesystem::is_directory(pathDest))
                     pathDest = pathDest / wallet.strWalletFile;
 

diff --git a/src/util.cpp b/src/util.cpp
index cf8ff53..6c007c1 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -862,7 +862,6 @@ string GetConfigFile()
 
     fs::path pathConfigFile(GetArg("-conf", "bitcoin.conf"));
     if (!pathConfigFile.is_complete()) pathConfigFile = fs::path(GetDataDir()) / pathConfigFile;
-    pathConfigFile.make_preferred();
     return pathConfigFile.string();
 }
 
@@ -877,7 +876,6 @@ bool ReadConfigFile(map<string, string>& mapSettingsRet,
         if (fs::is_directory(fs::system_complete(mapSettingsRet["-datadir"])))
         {
             fs::path pathDataDir(fs::system_complete(mapSettingsRet["-datadir"]));
-            pathDataDir.make_preferred();
 
             strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
         }
@@ -915,7 +913,6 @@ string GetPidFile()
 
     fs::path pathPidFile(GetArg("-pid", "bitcoind.pid"));
     if (!pathPidFile.is_complete()) pathPidFile = fs::path(GetDataDir()) / pathPidFile;
-    pathPidFile.make_preferred();
     return pathPidFile.string();
 }