Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ogre: Use explicit qualification for boost stuff to avoid potential tr1 conflicts with vc10. Thanks to Krishty to point it out. Use TinyFormatter instead of boost::format.

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@721 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-05-10 21:06:44 +00:00
parent 255082c39b
commit 55bdc6db63
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/OgreImporterMaterial.cpp
View File

@@ -53,11 +53,11 @@ using namespace std;
//#include "boost/format.hpp"
//#include "boost/foreach.hpp"
using namespace boost;
//using namespace boost;
#include "OgreImporter.h"
#include "irrXMLWrapper.h"
#include "TinyFormatter.h"
namespace Assimp
{
@@ -100,8 +100,8 @@ aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
*/
string MaterialFileName=m_CurrentFilename.substr(0, m_CurrentFilename.find('.'))+".material";
DefaultLogger::get()->info(str(format("Trying to load %1%") % MaterialFileName));
const string MaterialFileName=m_CurrentFilename.substr(0, m_CurrentFilename.find('.'))+".material";
DefaultLogger::get()->info("Trying to load " +MaterialFileName);
//Read the file into memory and put it in a stringstream
stringstream ss;
@@ -116,7 +116,7 @@ aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
return NewMaterial;
}
}
scoped_ptr<IOStream> MaterialFile(MatFilePtr);
boost::scoped_ptr<IOStream> MaterialFile(MatFilePtr);
vector<char> FileData(MaterialFile->FileSize());
MaterialFile->Read(&FileData[0], MaterialFile->FileSize(), 1);
BaseImporter::ConvertToUTF8(FileData);