llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-22 16:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove usages of _LIBCPP_MSVC which is never defined

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302736 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-10 21:40:58 +00:00
parent 2df956f21e
commit ab2f54f103
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/__config
View File

@@ -974,7 +974,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
# if defined(__GNUC__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \ # if defined(__GNUC__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \
(__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI) (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI)
# define _LIBCPP_NO_RTTI # define _LIBCPP_NO_RTTI
# elif defined(_LIBCPP_MSVC) && !defined(_CPPRTTI) # elif defined(_LIBCPP_COMPILER_MSVC) && !defined(_CPPRTTI)
# define _LIBCPP_NO_RTTI # define _LIBCPP_NO_RTTI
# endif # endif
#endif #endif

4
include/__undef_min_max
View File

@@ -10,7 +10,7 @@
#ifdef min #ifdef min
#if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS) #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 " _LIBCPP_WARNING("macro min is incompatible with C++. Try #define NOMINMAX "
"before any Windows header. #undefing min") "before any Windows header. #undefing min")
#else #else
@@ -22,7 +22,7 @@ _LIBCPP_WARNING("macro min is incompatible with C++. Try #define NOMINMAX "
#ifdef max #ifdef max
#if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS) #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 " _LIBCPP_WARNING("macro max is incompatible with C++. Try #define NOMINMAX "
"before any Windows header. #undefing max") "before any Windows header. #undefing max")
#else #else

2
include/ext/hash_map
View File

@@ -207,7 +207,7 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
#include <ext/__hash> #include <ext/__hash>
#if __DEPRECATED #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>") _LIBCPP_WARNING("Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map>")
#else #else
# warning Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map> # warning Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map>

2
include/ext/hash_set
View File

@@ -199,7 +199,7 @@ template <class Value, class Hash, class Pred, class Alloc>
#include <ext/__hash> #include <ext/__hash>
#if __DEPRECATED #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>") _LIBCPP_WARNING("Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set>")
#else #else
# warning Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set> # warning Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set>

2
src/include/atomic_support.h
View File

@@ -29,7 +29,7 @@
#endif #endif
#if !defined(_LIBCPP_HAS_ATOMIC_BUILTINS) && !defined(_LIBCPP_HAS_NO_THREADS) #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") _LIBCPP_WARNING("Building libc++ without __atomic builtins is unsupported")
# else # else
# warning Building libc++ without __atomic builtins is unsupported # warning Building libc++ without __atomic builtins is unsupported

2
src/thread.cpp
View File

@@ -99,7 +99,7 @@ thread::hardware_concurrency() _NOEXCEPT
#else // defined(CTL_HW) && defined(HW_NCPU) #else // defined(CTL_HW) && defined(HW_NCPU)
// TODO: grovel through /proc or check cpuid on x86 and similar // TODO: grovel through /proc or check cpuid on x86 and similar
// instructions on other architectures. // instructions on other architectures.
# if defined(_LIBCPP_MSVC) # if defined(_LIBCPP_WARNING)
_LIBCPP_WARNING("hardware_concurrency not yet implemented") _LIBCPP_WARNING("hardware_concurrency not yet implemented")
# else # else
# warning hardware_concurrency not yet implemented # warning hardware_concurrency not yet implemented

2
test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp
View File

@@ -416,7 +416,7 @@ void throws_in_constructor_test()
ThrowsOnCopy() = default; ThrowsOnCopy() = default;
bool operator()() const { bool operator()() const {
assert(false); assert(false);
#if defined(_LIBCPP_MSVC) #if defined(TEST_COMPILER_C1XX)
__assume(0); __assume(0);
#else #else
__builtin_unreachable(); __builtin_unreachable();