highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gavin Andresen
2012-04-11 14:00:48 -04:00
parent 37e7e72041
commit 2232717cba
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/util.cpp
View File

@@ -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();
}