generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move uncaught_exeption() definition inside the #ifdef block like uncaught_exceptions()

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238879 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2015-06-02 22:25:23 +00:00
parent c2a3137671
commit 22f6c0532d
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/cstring
View File

@ -67,15 +67,34 @@ size_t strlen(const char* s);
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
using ::size_t; 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 ::strcpy;
using ::strncpy; using ::strncpy;
using ::strcat; using ::strcat;
using ::strncat; 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 ::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 ::strcoll;
using ::strxfrm; using ::strxfrm;

2
src/exception.cpp
View File

@ -105,9 +105,9 @@ terminate() _NOEXCEPT
#endif // !__EMSCRIPTEN__ #endif // !__EMSCRIPTEN__
#endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) #endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(__EMSCRIPTEN__)
bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; } bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; }
#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(__EMSCRIPTEN__)
int uncaught_exceptions() _NOEXCEPT int uncaught_exceptions() _NOEXCEPT
{ {
#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION) #if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)