games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Update to Boost.Filesystem version 3, since Boost 1.50 drops support for version 2.

Browse Source 
Check http://forum.vcmi.eu/viewtopic.php?t=518
This commit is contained in:
Michał W. Urbańczyk
2012-07-02 09:04:05 +00:00
parent 758fb0679e
commit 54ca71d598
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Global.h
View File

@@ -49,8 +49,8 @@
#include <memory> #include <memory>
#include <cstdlib> #include <cstdlib>
//filesystem version 3 causes problems (and it's default as of boost 1.46) //The only available version is 3, as of Boost 1.50
#define BOOST_FILESYSTEM_VERSION 2 #define BOOST_FILESYSTEM_VERSION 3
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/assert.hpp> #include <boost/assert.hpp>

2
client/CPlayerInterface.cpp
View File

@@ -1553,7 +1553,7 @@ int CPlayerInterface::getLastIndex( std::string namePrefix)
{ {
if(is_regular(dir->status())) if(is_regular(dir->status()))
{ {
std::string name = dir->path().leaf(); std::string name = dir->path().leaf().string();
if(starts_with(name, namePrefix) && ends_with(name, ".vlgm1")) if(starts_with(name, namePrefix) && ends_with(name, ".vlgm1"))
{ {
char nr = name[namePrefix.size()]; char nr = name[namePrefix.size()];

2
lib/CCampaignHandler.cpp
View File

@@ -42,7 +42,7 @@ std::vector<CCampaignHeader> CCampaignHandler::getCampaignHeaders(GetMode mode)
for ( fs::directory_iterator file (tie); file!=end_iter; ++file ) for ( fs::directory_iterator file (tie); file!=end_iter; ++file )
{ {
if(fs::is_regular_file(file->status()) if(fs::is_regular_file(file->status())
&& boost::ends_with(file->path().filename(), ext)) && boost::ends_with(file->path().filename().string(), ext))
{ {
ret.push_back( getHeader( file->path().string(), false ) ); ret.push_back( getHeader( file->path().string(), false ) );
} }

2
lib/CFileUtility.cpp
View File

@@ -34,7 +34,7 @@ void CFileUtility::getFilesWithExt(std::vector<FileInfo> &out, const std::string
for ( fs::directory_iterator file (tie); file!=end_iter; ++file ) for ( fs::directory_iterator file (tie); file!=end_iter; ++file )
{ {
if(fs::is_regular_file(file->status()) if(fs::is_regular_file(file->status())
&& boost::ends_with(file->path().filename(), ext)) && boost::ends_with(file->path().filename().string(), ext))
{ {
std::time_t date = 0; std::time_t date = 0;
try try

4
lib/CLodHandler.cpp
View File

@@ -285,7 +285,7 @@ void CLodHandler::init(const std::string lodFile, const std::string dirName)
if (boost::filesystem::is_directory(dir->status())) if (boost::filesystem::is_directory(dir->status()))
{ {
path.resize(dir.level()+1); path.resize(dir.level()+1);
path.back() = dir->path().leaf(); path.back() = dir->path().leaf().string();
} }
if(boost::filesystem::is_regular(dir->status())) if(boost::filesystem::is_regular(dir->status()))
{ {
@@ -295,7 +295,7 @@ void CLodHandler::init(const std::string lodFile, const std::string dirName)
for (size_t i=0; i<dir.level() && i<path.size(); i++) for (size_t i=0; i<dir.level() && i<path.size(); i++)
e.realName += path[i] + '/'; e.realName += path[i] + '/';
e.realName += dir->path().leaf(); e.realName += dir->path().leaf().string();
initEntry(e, e.realName); initEntry(e, e.realName);