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

Fix Android compilation with STLport 

Satisfy STLport's runtime_error constructor with an explicit string argument.
pull/81/head
Jared Duke 2013-08-20 20:02:07 -07:00
parent 7db5dcb357
commit 9f2336e5d4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/poly2tri/poly2tri/common/shapes.h
View File

@ -38,6 +38,7 @@
#include <stdexcept> #include <stdexcept>
#include <assert.h> #include <assert.h>
#include <cmath> #include <cmath>
#include <string>
namespace p2t { namespace p2t {
@ -137,8 +138,8 @@ struct Edge {
p = &p2; p = &p2;
} else if (p1.x == p2.x) { } else if (p1.x == p2.x) {
// Repeat points // Repeat points
// ASSIMP_CHANGE (aramis_acg) // ASSIMP_CHANGE (aramis_acg)
throw std::runtime_error("repeat points"); throw std::runtime_error(std::string("repeat points"));
//assert(false); //assert(false);
} }
} }