aboutsummaryrefslogtreecommitdiff
path: root/system/lib/libcxx/string.cpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-08 16:01:27 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-08 16:04:05 -0800
commitb873dc778f52461129b1e28fb12dd3d4a309851c (patch)
treee82913bc549a83104ce8abfb518eca6cb6d8aa83 /system/lib/libcxx/string.cpp
parent140ea9e81feb09d8f2559995c73d49a39424ef5d (diff)
parente0268fa1035a718341c53921eee9318d4a8033cd (diff)
Merge branch 'incoming' into f32
Conflicts: src/parseTools.js src/preamble.js
Diffstat (limited to 'system/lib/libcxx/string.cpp')
-rw-r--r--system/lib/libcxx/string.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/lib/libcxx/string.cpp b/system/lib/libcxx/string.cpp
index 5a869116..fde52129 100644
--- a/system/lib/libcxx/string.cpp
+++ b/system/lib/libcxx/string.cpp
@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
+#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
+
#include "string"
#include "cstdlib"
#include "cwchar"
@@ -89,7 +91,7 @@ inline
int
as_integer(const string& func, const string& s, size_t* idx, int base )
{
- // Use long as no Stantard string to integer exists.
+ // Use long as no Standard string to integer exists.
long r = as_integer_helper<long>( func, s, idx, base, strtol );
if (r < numeric_limits<int>::min() || numeric_limits<int>::max() < r)
throw_from_string_out_of_range(func);