summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-06-02 22:25:23 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-06-02 22:25:23 +0000
commitef96861df9a93c5554e4fb8478b7d9449d57c24f (patch)
treeafa2fdef972140c4fe8b84ec656b804ca429ed7a
parent021cad043a794ae56aab7ddd1d53b571f3a5f020 (diff)
downloadbcm5719-llvm-ef96861df9a93c5554e4fb8478b7d9449d57c24f.tar.gz
bcm5719-llvm-ef96861df9a93c5554e4fb8478b7d9449d57c24f.zip
Move uncaught_exeption() definition inside the #ifdef block like uncaught_exceptions()
llvm-svn: 238879
-rw-r--r--libcxx/include/cstring27
-rw-r--r--libcxx/src/exception.cpp2
2 files changed, 24 insertions, 5 deletions
diff --git a/libcxx/include/cstring b/libcxx/include/cstring
index 21c9155cd4d..d3659b36179 100644
--- a/libcxx/include/cstring
+++ b/libcxx/include/cstring
@@ -67,15 +67,34 @@ size_t strlen(const char* s);
_LIBCPP_BEGIN_NAMESPACE_STD
using ::size_t;
-using ::memcpy;
-using ::memmove;
+
+// using ::memcpy;
+inline _LIBCPP_INLINE_VISIBILITY
+void* memcpy(void* __s1, const void* __s2, size_t __n) __attribute__((nonnull(1, 2)))
+{ return ::memcpy(__s1, __s2, __n); }
+
+// using ::memmove;
+inline _LIBCPP_INLINE_VISIBILITY
+void* memmove(void* __s1, const void* __s2, size_t __n) __attribute__((nonnull(1, 2)))
+{ return ::memmove(__s1, __s2, __n); }
+
using ::strcpy;
using ::strncpy;
using ::strcat;
using ::strncat;
-using ::memcmp;
+
+// using ::memcmp;
+inline _LIBCPP_INLINE_VISIBILITY
+int memcmp(const void* __s1, const void* __s2, size_t __n) __attribute__((nonnull(1, 2)))
+{ return ::memcmp(__s1, __s2, __n); }
+
using ::strcmp;
-using ::strncmp;
+
+// using ::strncmp;
+inline _LIBCPP_INLINE_VISIBILITY
+int strncmp(const char* __s1, const char* __s2, size_t __n) __attribute__((nonnull(1, 2)))
+{ return ::memcmp(__s1, __s2, __n); }
+
using ::strcoll;
using ::strxfrm;
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index a13a0b9b064..2c16060a758 100644
--- a/libcxx/src/exception.cpp
+++ b/libcxx/src/exception.cpp
@@ -105,9 +105,9 @@ terminate() _NOEXCEPT
#endif // !__EMSCRIPTEN__
#endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
+#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(__EMSCRIPTEN__)
bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; }
-#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(__EMSCRIPTEN__)
int uncaught_exceptions() _NOEXCEPT
{
#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)
OpenPOWER on IntegriCloud