v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[*] Removed Boost dependency.

pull/1011/head
Alexandr Arutjunov 2016-09-29 23:48:41 +03:00
parent 61bced27df
commit 8ad6c80dac
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/AMFImporter.cpp
View File

@ -12,10 +12,8 @@
#include "fast_atof.h" #include "fast_atof.h"
#include "DefaultIOSystem.h" #include "DefaultIOSystem.h"
// Header files, Boost.
#include <boost/scoped_ptr.hpp>
// Header files, stdlib. // Header files, stdlib.
#include <memory>
#include <string> #include <string>
namespace Assimp namespace Assimp
@ -364,13 +362,13 @@ uint8_t arr4[4], arr3[3];
void AMFImporter::ParseFile(const std::string& pFile, IOSystem* pIOHandler) void AMFImporter::ParseFile(const std::string& pFile, IOSystem* pIOHandler)
{ {
irr::io::IrrXMLReader* OldReader = mReader;// store current XMLreader. irr::io::IrrXMLReader* OldReader = mReader;// store current XMLreader.
boost::scoped_ptr<IOStream> file(pIOHandler->Open(pFile, "rb")); std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
// Check whether we can read from the file // Check whether we can read from the file
if(file.get() == NULL) throw DeadlyImportError("Failed to open AMF file " + pFile + "."); if(file.get() == NULL) throw DeadlyImportError("Failed to open AMF file " + pFile + ".");
// generate a XML reader for it // generate a XML reader for it
boost::scoped_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get())); std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get()));
mReader = irr::io::createIrrXMLReader(mIOWrapper.get()); mReader = irr::io::createIrrXMLReader(mIOWrapper.get());
if(!mReader) throw DeadlyImportError("Failed to create XML reader for file" + pFile + "."); if(!mReader) throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
// //