From ef96861df9a93c5554e4fb8478b7d9449d57c24f Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 2 Jun 2015 22:25:23 +0000 Subject: Move uncaught_exeption() definition inside the #ifdef block like uncaught_exceptions() llvm-svn: 238879 --- libcxx/src/exception.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libcxx/src/exception.cpp') diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index a13a0b9b064c..2c16060a7583 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) -- cgit v1.2.3