Tweak handling of boost filesystem versions

This commit is contained in:
Gavin Andresen 2011-11-15 14:28:51 -05:00
parent 8d0923109d
commit c4de918478
2 changed files with 2 additions and 2 deletions

View File

@ -256,7 +256,7 @@ windows:RC_FILE = src/qt/res/bitcoin-qt.rc
macx:HEADERS += src/qt/macdockiconhandler.h macx:HEADERS += src/qt/macdockiconhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns macx:ICON = src/qt/res/icons/bitcoin.icns
macx:TARGET = "Bitcoin-Qt" macx:TARGET = "Bitcoin-Qt"

View File

@ -51,7 +51,7 @@ static void EnvShutdown(bool fRemoveLogFiles)
while (it != filesystem::directory_iterator()) while (it != filesystem::directory_iterator())
{ {
const filesystem::path& p = it->path(); const filesystem::path& p = it->path();
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION >= 3
std::string f = p.filename().generic_string(); std::string f = p.filename().generic_string();
#else #else
std::string f = p.filename(); std::string f = p.filename();