changeset 26680:299bb45fc7ea

Merge #9727: Remove fallbacks for boost_filesystem < v3 056aba2 Remove fallbacks for boost_filesystem < v3 (Wladimir J. van der Laan)
author Wladimir J. van der Laan <laanwj@gmail.com>
date Tue, 21 Feb 2017 17:08:25 +0100
parents b4b60ce5f4a3 428299982032
children f18919e9e7d9 95dbcc493f91 9a302a68d48c f63f95e4330f
files src/qt/guiutil.cpp src/wallet/wallet.cpp
diffstat 3 files changed, 0 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/guiutil.cpp	Tue Feb 21 15:13:13 2017 +0100
+++ b/src/qt/guiutil.cpp	Tue Feb 21 17:08:25 2017 +0100
@@ -37,9 +37,7 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#if BOOST_FILESYSTEM_VERSION >= 3
 #include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
-#endif
 #include <boost/scoped_array.hpp>
 
 #include <QAbstractItemView>
@@ -67,9 +65,7 @@
 #include <QFontDatabase>
 #endif
 
-#if BOOST_FILESYSTEM_VERSION >= 3
 static boost::filesystem::detail::utf8_codecvt_facet utf8;
-#endif
 
 #if defined(Q_OS_MAC)
 extern double NSAppKitVersionNumber;
@@ -863,7 +859,6 @@
     QApplication::clipboard()->setText(str, QClipboard::Selection);
 }
 
-#if BOOST_FILESYSTEM_VERSION >= 3
 boost::filesystem::path qstringToBoostPath(const QString &path)
 {
     return boost::filesystem::path(path.toStdString(), utf8);
@@ -873,18 +868,6 @@
 {
     return QString::fromStdString(path.string(utf8));
 }
-#else
-#warning Conversion between boost path and QString can use invalid character encoding with boost_filesystem v2 and older
-boost::filesystem::path qstringToBoostPath(const QString &path)
-{
-    return boost::filesystem::path(path.toStdString());
-}
-
-QString boostPathToQString(const boost::filesystem::path &path)
-{
-    return QString::fromStdString(path.string());
-}
-#endif
 
 QString formatDurationStr(int secs)
 {
--- a/src/test/testutil.cpp	Tue Feb 21 15:13:13 2017 +0100
+++ b/src/test/testutil.cpp	Tue Feb 21 17:08:25 2017 +0100
@@ -11,23 +11,5 @@
 #include <boost/filesystem.hpp>
 
 boost::filesystem::path GetTempPath() {
-#if BOOST_FILESYSTEM_VERSION == 3
     return boost::filesystem::temp_directory_path();
-#else
-    // TODO: remove when we don't support filesystem v2 anymore
-    boost::filesystem::path path;
-#ifdef WIN32
-    char pszPath[MAX_PATH] = "";
-
-    if (GetTempPathA(MAX_PATH, pszPath))
-        path = boost::filesystem::path(pszPath);
-#else
-    path = boost::filesystem::path("/tmp");
-#endif
-    if (path.empty() || !boost::filesystem::is_directory(path)) {
-        LogPrintf("GetTempPath(): failed to find temp path\n");
-        return boost::filesystem::path("");
-    }
-    return path;
-#endif
 }
--- a/src/wallet/wallet.cpp	Tue Feb 21 15:13:13 2017 +0100
+++ b/src/wallet/wallet.cpp	Tue Feb 21 17:08:25 2017 +0100
@@ -3892,11 +3892,7 @@
                     pathDest /= strWalletFile;
 
                 try {
-#if BOOST_VERSION >= 104000
                     boost::filesystem::copy_file(pathSrc, pathDest, boost::filesystem::copy_option::overwrite_if_exists);
-#else
-                    boost::filesystem::copy_file(pathSrc, pathDest);
-#endif
                     LogPrintf("copied %s to %s\n", strWalletFile, pathDest.string());
                     return true;
                 } catch (const boost::filesystem::filesystem_error& e) {