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

Merge pull request #16 from jdduke/master 

Fix compilation under VC10 with Boost 1.49.0
pull/19/head
Alexander Gessler 2013-01-24 21:27:47 -08:00
parent bbe8763d9e 528c7c7737
commit 713894032a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/FBXConverter.cpp
View File

@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
#include <iterator>
#include <boost/tuple/tuple.hpp>
#include "FBXParser.h"

8
code/STEPFileEncoding.cpp
View File

@ -354,7 +354,7 @@ bool STEP::StringToUTF8(std::string& s)
}
const size_t count = (j-basei)/4;
boost::scoped_array<UTF16> src = boost::scoped_array<UTF16>(new UTF16[count]);
boost::scoped_array<UTF16> src(new UTF16[count]);
const char* cur = s.c_str() + basei;
for (size_t k = 0; k < count; ++k, cur += 4) {
@ -363,7 +363,7 @@ bool STEP::StringToUTF8(std::string& s)
}
const size_t dcount = count * 3; // this is enough to hold all possible outputs
boost::scoped_array<UTF8> dest = boost::scoped_array<UTF8>(new UTF8[dcount]);
boost::scoped_array<UTF8> dest(new UTF8[dcount]);
const UTF16* srct = src.get();
UTF8* destt = dest.get();
@ -387,7 +387,7 @@ bool STEP::StringToUTF8(std::string& s)
}
const size_t count = (j-basei)/8;
boost::scoped_array<UTF32> src = boost::scoped_array<UTF32>(new UTF32[count]);
boost::scoped_array<UTF32> src(new UTF32[count]);
const char* cur = s.c_str() + basei;
for (size_t k = 0; k < count; ++k, cur += 8) {
@ -398,7 +398,7 @@ bool STEP::StringToUTF8(std::string& s)
}
const size_t dcount = count * 5; // this is enough to hold all possible outputs
boost::scoped_array<UTF8> dest = boost::scoped_array<UTF8>(new UTF8[dcount]);
boost::scoped_array<UTF8> dest(new UTF8[dcount]);
const UTF32* srct = src.get();
UTF8* destt = dest.get();