From e505328fcd1ac41f2d6c504337a6262acb72e5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= Date: Thu, 24 Feb 2011 14:01:58 +0000 Subject: [PATCH] Reverted r1992 for now [boost < 1.46 won't work with it] --- client/CPlayerInterface.cpp | 2 +- client/CPreGame.cpp | 2 +- lib/CCampaignHandler.cpp | 2 +- lib/CLodHandler.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp index 8399a767e..bb076679f 100644 --- a/client/CPlayerInterface.cpp +++ b/client/CPlayerInterface.cpp @@ -1373,7 +1373,7 @@ int CPlayerInterface::getLastIndex( std::string namePrefix) { if(is_regular(dir->status())) { - std::string name = dir->path().leaf().string(); + std::string name = dir->path().leaf(); if(starts_with(name, namePrefix) && ends_with(name, ".vlgm1")) { char nr = name[namePrefix.size()]; diff --git a/client/CPreGame.cpp b/client/CPreGame.cpp index c8e3dcbcf..9fa9dd6ac 100644 --- a/client/CPreGame.cpp +++ b/client/CPreGame.cpp @@ -839,7 +839,7 @@ void SelectionTab::getFiles(std::vector &out, const std::string &dirna for ( fs::directory_iterator file (tie); file!=end_iter; ++file ) { if(fs::is_regular_file(file->status()) - && boost::ends_with(file->path().filename().string(), ext)) + && boost::ends_with(file->path().filename(), ext)) { std::time_t date = 0; try diff --git a/lib/CCampaignHandler.cpp b/lib/CCampaignHandler.cpp index 43cd02d4d..a5c56f678 100644 --- a/lib/CCampaignHandler.cpp +++ b/lib/CCampaignHandler.cpp @@ -45,7 +45,7 @@ std::vector CCampaignHandler::getCampaignHeaders(GetMode mode) for ( fs::directory_iterator file (tie); file!=end_iter; ++file ) { if(fs::is_regular_file(file->status()) - && boost::ends_with(file->path().filename().string(), ext)) + && boost::ends_with(file->path().filename(), ext)) { ret.push_back( getHeader( file->path().string(), false ) ); } diff --git a/lib/CLodHandler.cpp b/lib/CLodHandler.cpp index 0399b14d9..e4a9ee25c 100644 --- a/lib/CLodHandler.cpp +++ b/lib/CLodHandler.cpp @@ -300,7 +300,7 @@ void CLodHandler::init(const std::string lodFile, const std::string dirName) if(boost::filesystem::is_regular(dir->status())) { Entry e; - e.realName = dir->path().leaf().string(); + e.realName = dir->path().leaf(); initEntry(e, e.realName); if(vstd::contains(entries, e)) //file present in .lod - overwrite its entry