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

Removed raw references to __APPLE__; now just check to see if it is defined.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@177297 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2013-03-18 17:45:34 +00:00
parent a22d2addb1
commit dece7fe670
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/__locale
View File

@ -21,7 +21,7 @@
#include <locale.h> #include <locale.h>
#ifdef _WIN32 #ifdef _WIN32
# include <support/win32/locale_win32.h> # include <support/win32/locale_win32.h>
#elif (__GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__) #elif (__GLIBC__ || defined(__APPLE__) || __FreeBSD__ || __sun__)
# include <xlocale.h> # include <xlocale.h>
#endif // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_ #endif // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_

2
include/iterator
View File

@ -317,7 +317,7 @@ template <class T, size_t N> T* end(T (&array)[N]);
#include <type_traits> #include <type_traits>
#include <cstddef> #include <cstddef>
#include <iosfwd> #include <iosfwd>
#if __APPLE__ #ifdef __APPLE__
#include <Availability.h> #include <Availability.h>
#endif #endif

6
include/locale
View File

@ -181,7 +181,7 @@ template <class charT> class messages_byname;
#include <streambuf> #include <streambuf>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#if !__APPLE__ #ifndef __APPLE__
#include <cstdarg> #include <cstdarg>
#endif #endif
#include <cstdlib> #include <cstdlib>
@ -192,7 +192,7 @@ template <class charT> class messages_byname;
#include <nl_types.h> #include <nl_types.h>
#endif // !_WIN32 #endif // !_WIN32
#if __APPLE__ #ifdef __APPLE__
#include <Availability.h> #include <Availability.h>
#endif #endif
@ -204,7 +204,7 @@ template <class charT> class messages_byname;
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if __APPLE__ || __FreeBSD__ #if defined(__APPLE__) || __FreeBSD__
# define _LIBCPP_GET_C_LOCALE 0 # define _LIBCPP_GET_C_LOCALE 0
#else #else
# define _LIBCPP_GET_C_LOCALE __cloc() # define _LIBCPP_GET_C_LOCALE __cloc()

4
src/chrono.cpp
View File

@ -9,7 +9,7 @@
#include "chrono" #include "chrono"
#include <sys/time.h> //for gettimeofday and timeval #include <sys/time.h> //for gettimeofday and timeval
#if __APPLE__ #ifdef __APPLE__
#include <mach/mach_time.h> // mach_absolute_time, mach_timebase_info_data_t #include <mach/mach_time.h> // mach_absolute_time, mach_timebase_info_data_t
#else /* !__APPLE__ */ #else /* !__APPLE__ */
#include <cerrno> // errno #include <cerrno> // errno
@ -50,7 +50,7 @@ system_clock::from_time_t(time_t t) _NOEXCEPT
const bool steady_clock::is_steady; const bool steady_clock::is_steady;
#if __APPLE__ #ifdef __APPLE__
// mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of // mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of
// nanoseconds since the computer booted up. MachInfo.numer and MachInfo.denom // nanoseconds since the computer booted up. MachInfo.numer and MachInfo.denom
// are run time constants supplied by the OS. This clock has no relationship // are run time constants supplied by the OS. This clock has no relationship

4
src/exception.cpp
View File

@ -14,7 +14,7 @@
#define __has_include(inc) 0 #define __has_include(inc) 0
#endif #endif
#if __APPLE__ #ifdef __APPLE__
#include <cxxabi.h> #include <cxxabi.h>
using namespace __cxxabiv1; using namespace __cxxabiv1;
@ -102,7 +102,7 @@ terminate() _NOEXCEPT
#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) #if !defined(LIBCXXRT) && !defined(__GLIBCXX__)
bool uncaught_exception() _NOEXCEPT bool uncaught_exception() _NOEXCEPT
{ {
#if __APPLE__ || defined(_LIBCPPABI_VERSION) #if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)
// on Darwin, there is a helper function so __cxa_get_globals is private // on Darwin, there is a helper function so __cxa_get_globals is private
return __cxa_uncaught_exception(); return __cxa_uncaught_exception();
#else // __APPLE__ #else // __APPLE__

2
src/new.cpp
View File

@ -15,7 +15,7 @@
#define __has_include(inc) 0 #define __has_include(inc) 0
#endif #endif
#if __APPLE__ #ifdef __APPLE__
#include <cxxabi.h> #include <cxxabi.h>
#ifndef _LIBCPPABI_VERSION #ifndef _LIBCPPABI_VERSION

2
src/stdexcept.cpp
View File

@ -20,7 +20,7 @@
#define __has_include(inc) 0 #define __has_include(inc) 0
#endif #endif
#if __APPLE__ #ifdef __APPLE__
#include <cxxabi.h> #include <cxxabi.h>
#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
#include <cxxabi.h> #include <cxxabi.h>

4
src/typeinfo.cpp
View File

@ -12,7 +12,7 @@
#define __has_include(inc) 0 #define __has_include(inc) 0
#endif #endif
#if __APPLE__ #ifdef __APPLE__
#include <cxxabi.h> #include <cxxabi.h>
#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
#include <cxxabi.h> #include <cxxabi.h>
@ -50,7 +50,7 @@ std::bad_typeid::what() const _NOEXCEPT
return "std::bad_typeid"; return "std::bad_typeid";
} }
#if __APPLE__ #ifdef __APPLE__
// On Darwin, the cxa_bad_* functions cannot be in the lower level library // On Darwin, the cxa_bad_* functions cannot be in the lower level library
// because bad_cast and bad_typeid are defined in his higher level library // because bad_cast and bad_typeid are defined in his higher level library
void __cxxabiv1::__cxa_bad_typeid() { throw std::bad_typeid(); } void __cxxabiv1::__cxa_bad_typeid() { throw std::bad_typeid(); }

2
test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
View File

@ -24413,7 +24413,7 @@ void test12()
output_iterator<char*> iter; output_iterator<char*> iter;
std::locale lc = std::locale::classic(); std::locale lc = std::locale::classic();
std::locale lg(lc, new my_numpunct); std::locale lg(lc, new my_numpunct);
#if __APPLE__ #ifdef __APPLE__
// This test is failing on FreeBSD, possibly due to different representations // This test is failing on FreeBSD, possibly due to different representations
// of the floating point numbers. // of the floating point numbers.
const my_facet f(1); const my_facet f(1);

4
test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
View File

@ -93,7 +93,7 @@ int main()
assert(t.tm_hour == 23); assert(t.tm_hour == 23);
assert(err == std::ios_base::eofbit); assert(err == std::ios_base::eofbit);
} }
#if __APPLE__ #ifdef __APPLE__
{ {
const my_facet f("ru_RU", 1); const my_facet f("ru_RU", 1);
const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430" const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430"
@ -128,7 +128,7 @@ int main()
assert(t.tm_hour == 23); assert(t.tm_hour == 23);
assert(err == std::ios_base::eofbit); assert(err == std::ios_base::eofbit);
} }
#if __APPLE__ #ifdef __APPLE__
{ {
const my_facet f("zh_CN", 1); const my_facet f("zh_CN", 1);
const wchar_t in[] = L"\x516D" const wchar_t in[] = L"\x516D"