Browse Source

Reverted r1992 for now [boost < 1.46 won't work with it]

Michał W. Urbańczyk 14 years ago
parent
commit
e505328fcd
4 changed files with 4 additions and 4 deletions
  1. 1 1
      client/CPlayerInterface.cpp
  2. 1 1
      client/CPreGame.cpp
  3. 1 1
      lib/CCampaignHandler.cpp
  4. 1 1
      lib/CLodHandler.cpp

+ 1 - 1
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()];

+ 1 - 1
client/CPreGame.cpp

@@ -839,7 +839,7 @@ void SelectionTab::getFiles(std::vector<FileInfo> &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

+ 1 - 1
lib/CCampaignHandler.cpp

@@ -45,7 +45,7 @@ std::vector<CCampaignHeader> 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 ) );
 			}

+ 1 - 1
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