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

Merge pull request #81 from jdduke/android_fix 

Fix Android compilation with STLport
pull/83/head
Alexander Gessler 2013-08-21 03:12:12 -07:00
parent 7496e5ce55 9f2336e5d4
commit 8dc1043169
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 <assert.h>
#include <cmath>
#include <string>
namespace p2t {
@ -137,8 +138,8 @@ struct Edge {
p = &p2;
} else if (p1.x == p2.x) {
// Repeat points
// ASSIMP_CHANGE (aramis_acg)
throw std::runtime_error("repeat points");
// ASSIMP_CHANGE (aramis_acg)
throw std::runtime_error(std::string("repeat points"));
//assert(false);
}
}