Author: ericwf Date: Wed May 10 16:40:58 2017 New Revision: 302736 URL: http://llvm.org/viewvc/llvm-project?rev=302736&view=rev Log: Remove usages of _LIBCPP_MSVC which is never defined
Modified: libcxx/trunk/include/__config libcxx/trunk/include/__undef_min_max libcxx/trunk/include/ext/hash_map libcxx/trunk/include/ext/hash_set libcxx/trunk/src/include/atomic_support.h libcxx/trunk/src/thread.cpp libcxx/trunk/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp Modified: libcxx/trunk/include/__config URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/include/__config (original) +++ libcxx/trunk/include/__config Wed May 10 16:40:58 2017 @@ -974,7 +974,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit # if defined(__GNUC__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \ (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI) # define _LIBCPP_NO_RTTI -# elif defined(_LIBCPP_MSVC) && !defined(_CPPRTTI) +# elif defined(_LIBCPP_COMPILER_MSVC) && !defined(_CPPRTTI) # define _LIBCPP_NO_RTTI # endif #endif Modified: libcxx/trunk/include/__undef_min_max URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__undef_min_max?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/include/__undef_min_max (original) +++ libcxx/trunk/include/__undef_min_max Wed May 10 16:40:58 2017 @@ -10,7 +10,7 @@ #ifdef min #if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS) -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("macro min is incompatible with C++. Try #define NOMINMAX " "before any Windows header. #undefing min") #else @@ -22,7 +22,7 @@ _LIBCPP_WARNING("macro min is incompatib #ifdef max #if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS) -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("macro max is incompatible with C++. Try #define NOMINMAX " "before any Windows header. #undefing max") #else Modified: libcxx/trunk/include/ext/hash_map URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ext/hash_map?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/include/ext/hash_map (original) +++ libcxx/trunk/include/ext/hash_map Wed May 10 16:40:58 2017 @@ -207,7 +207,7 @@ template <class Key, class T, class Hash #include <ext/__hash> #if __DEPRECATED -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map>") #else # warning Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map> Modified: libcxx/trunk/include/ext/hash_set URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ext/hash_set?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/include/ext/hash_set (original) +++ libcxx/trunk/include/ext/hash_set Wed May 10 16:40:58 2017 @@ -199,7 +199,7 @@ template <class Value, class Hash, class #include <ext/__hash> #if __DEPRECATED -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set>") #else # warning Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set> Modified: libcxx/trunk/src/include/atomic_support.h URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/include/atomic_support.h?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/src/include/atomic_support.h (original) +++ libcxx/trunk/src/include/atomic_support.h Wed May 10 16:40:58 2017 @@ -29,7 +29,7 @@ #endif #if !defined(_LIBCPP_HAS_ATOMIC_BUILTINS) && !defined(_LIBCPP_HAS_NO_THREADS) -# if defined(_LIBCPP_MSVC) +# if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("Building libc++ without __atomic builtins is unsupported") # else # warning Building libc++ without __atomic builtins is unsupported Modified: libcxx/trunk/src/thread.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/thread.cpp?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/src/thread.cpp (original) +++ libcxx/trunk/src/thread.cpp Wed May 10 16:40:58 2017 @@ -99,7 +99,7 @@ thread::hardware_concurrency() _NOEXCEPT #else // defined(CTL_HW) && defined(HW_NCPU) // TODO: grovel through /proc or check cpuid on x86 and similar // instructions on other architectures. -# if defined(_LIBCPP_MSVC) +# if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("hardware_concurrency not yet implemented") # else # warning hardware_concurrency not yet implemented Modified: libcxx/trunk/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp?rev=302736&r1=302735&r2=302736&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp Wed May 10 16:40:58 2017 @@ -416,7 +416,7 @@ void throws_in_constructor_test() ThrowsOnCopy() = default; bool operator()() const { assert(false); -#if defined(_LIBCPP_MSVC) +#if defined(TEST_COMPILER_C1XX) __assume(0); #else __builtin_unreachable(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits