Integrating with NDK r5: STLPort still does not compile

2011-01-28 14:38:24 +00:00
parent 8418a37c02
commit 343458d9a6
37 changed files with 153 additions and 145 deletions
--- a/project/jni/stlport/src/dll_main.cpp
+++ b/project/jni/stlport/src/dll_main.cpp
@@ -139,7 +139,9 @@ underflow_error::~underflow_error() _STLP_NOTHROW_INHERENTLY {}

 #if !defined(_STLP_WCE_EVC3)
 #  if defined (_STLP_NO_BAD_ALLOC)
+#    ifndef ANDROID
 const nothrow_t nothrow /* = {} */;
+#    endif
 #  endif
 #endif

--- a/project/jni/stlport/src/facets_byname.cpp
+++ b/project/jni/stlport/src/facets_byname.cpp
@@ -17,6 +17,7 @@
 */
 #include "stlport_prefix.h"

+#include <typeinfo>
 #include <hash_map>
 #include <vector>