mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Fixed Boost errors with 1.46 caused by the deprecated name file_string()

Browse source
This commit is contained in:
Pieter van der Kloet 2011-03-28 17:36:05 +02:00
parent 5845e71dd8
commit 833a61dd82
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/engine.cpp
View file

@ -244,7 +244,7 @@ void OMW::Engine::loadBSA()
if (boost::filesystem::extension (iter->path())==".bsa")
{
std::cout << "Adding " << iter->path().string() << std::endl;
addBSA(iter->path().file_string());
addBSA(iter->path().string());
}
}
}
@ -254,7 +254,7 @@ void OMW::Engine::loadBSA()
void OMW::Engine::addResourcesDirectory (const boost::filesystem::path& path)
{
mOgre.getRoot()->addResourceLocation (path.file_string(), "FileSystem",
mOgre.getRoot()->addResourceLocation (path.string(), "FileSystem",
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true);
}

4
apps/openmw/mwsound/soundmanager.cpp
View file

@ -312,7 +312,7 @@ namespace MWSound
{
MP3Lookup(dataDir / "Music/Explore/");
if(useSound)
mData = new SoundImpl(root, camera, store, (dataDir / "Sound").file_string());
mData = new SoundImpl(root, camera, store, (dataDir / "Sound").string());
}
SoundManager::~SoundManager()
@ -349,7 +349,7 @@ namespace MWSound
{
fileIter++;
}
std::string music = fileIter->file_string();
std::string music = fileIter->string();
try
{
std::cout << "Playing " << music << "\n";

2
apps/openmw/mwworld/world.cpp
View file

@ -419,7 +419,7 @@ namespace MWWorld
std::cout << "Loading ESM " << masterPath.string() << "\n";
// This parses the ESM file and loads a sample cell
mEsm.open (masterPath.file_string());
mEsm.open (masterPath.string());
mStore.load (mEsm);
mPlayer = new MWWorld::Player (mScene.getPlayer(), mStore.npcs.find ("player"), *this);

4
components/file_finder/file_finder.hpp
View file

@ -20,7 +20,7 @@ class FileFinderT
void add(const boost::filesystem::path &pth)
{
std::string file = pth.file_string();
std::string file = pth.string();
std::string key = file.substr(cut);
owner->table[key] = file;
}
@ -35,7 +35,7 @@ public:
// Remember the original path length, so we can cut it away from
// the relative paths used as keys
std::string pstring = path.file_string();
std::string pstring = path.string();
inserter.cut = pstring.size();
// If the path does not end in a slash, then boost will add one