summaryrefslogtreecommitdiff
path: root/external/bsd/libc++/dist/libcxx/src/string.cpp
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2013-11-11 23:42:23 +0000
committerjoerg <joerg@NetBSD.org>2013-11-11 23:42:23 +0000
commit7b508f5cf1cffaba9056e779bab2a09bf6767655 (patch)
tree1ded8b22c412394ce3b7605b7da7e7d752c5b1e4 /external/bsd/libc++/dist/libcxx/src/string.cpp
parentf4c7577e0d6de880acbb5d05bffab23df87c32d5 (diff)
Import libc++ r194207. This brings in various bug fixes, a good chunk of
support for the up-coming C++14 and improved compatibility with various compilers other than Clang.
Diffstat (limited to 'external/bsd/libc++/dist/libcxx/src/string.cpp')
-rw-r--r--external/bsd/libc++/dist/libcxx/src/string.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/external/bsd/libc++/dist/libcxx/src/string.cpp b/external/bsd/libc++/dist/libcxx/src/string.cpp
index 5a86911654d..fde52129e9f 100644
--- a/external/bsd/libc++/dist/libcxx/src/string.cpp
+++ b/external/bsd/libc++/dist/libcxx/src/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);