summaryrefslogtreecommitdiffstats
path: root/libcxx/include/ext
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2017-02-06 05:26:49 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2017-02-06 05:26:49 +0000
commitbcc85cbcde661e8bf02a5e0c385f9aa509a8dc39 (patch)
treee288d8a3385f0e4ff95295b335db1568533fd9ab /libcxx/include/ext
parent5d9ecd23e8b7e84376d8361a49b6e6b923a623f5 (diff)
downloadbcm5719-llvm-bcc85cbcde661e8bf02a5e0c385f9aa509a8dc39.tar.gz
bcm5719-llvm-bcc85cbcde661e8bf02a5e0c385f9aa509a8dc39.zip
Refer to _LIBCPP_MSVC macro where applicable
Replace preprocess conditions of defined(_MSC_VER) && !defined(__clang__) with defined(_LIBCPP_MSVC). NFC. Patch by Dave Lee! llvm-svn: 294171
Diffstat (limited to 'libcxx/include/ext')
-rw-r--r--libcxx/include/ext/hash_map2
-rw-r--r--libcxx/include/ext/hash_set2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map
index 8998bec66c3..fab36a155ba 100644
--- a/libcxx/include/ext/hash_map
+++ b/libcxx/include/ext/hash_map
@@ -207,7 +207,7 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
#include <ext/__hash>
#if __DEPRECATED
-#if defined(_MSC_VER) && ! defined(__clang__)
+#if defined(_LIBCPP_MSVC)
_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>
diff --git a/libcxx/include/ext/hash_set b/libcxx/include/ext/hash_set
index 7c6a8bf0ccc..916ed6910d7 100644
--- a/libcxx/include/ext/hash_set
+++ b/libcxx/include/ext/hash_set
@@ -199,7 +199,7 @@ template <class Value, class Hash, class Pred, class Alloc>
#include <ext/__hash>
#if __DEPRECATED
-#if defined(_MSC_VER) && ! defined(__clang__)
+#if defined(_LIBCPP_MSVC)
_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>
OpenPOWER on IntegriCloud