summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2018-12-21 20:14:43 +0000
committerLouis Dionne <ldionne@apple.com>2018-12-21 20:14:43 +0000
commit9f3561c29232cbd3fa73afdddce7d5c89c41484b (patch)
tree083d60567758b4143aeaa9ed373684cfcaad9b8c
parent569ac6980957344d90a260ed36e46be72dede973 (diff)
downloadbcm5719-llvm-9f3561c29232cbd3fa73afdddce7d5c89c41484b.tar.gz
bcm5719-llvm-9f3561c29232cbd3fa73afdddce7d5c89c41484b.zip
[libcxx] Remove unused macro _LIBCPP_HAS_UNIQUE_TYPEINFO
Summary: We already have the negation of that as _LIBCPP_HAS_NONUNIQUE_TYPEINFO. Having both defined is confusing, since only one of them is used. Reviewers: EricWF, mclow.lists Subscribers: christof, jkorous, dexonsmith, libcxx-commits Differential Revision: https://reviews.llvm.org/D54537 llvm-svn: 349947
-rw-r--r--libcxx/include/typeinfo8
1 files changed, 2 insertions, 6 deletions
diff --git a/libcxx/include/typeinfo b/libcxx/include/typeinfo
index 92f1e225564..8411532860b 100644
--- a/libcxx/include/typeinfo
+++ b/libcxx/include/typeinfo
@@ -73,12 +73,8 @@ public:
#include <vcruntime_typeinfo.h>
#else
-#if !defined(_LIBCPP_ABI_MICROSOFT)
-#if defined(_LIBCPP_NONUNIQUE_RTTI_BIT)
-#define _LIBCPP_HAS_NONUNIQUE_TYPEINFO
-#else
-#define _LIBCPP_HAS_UNIQUE_TYPEINFO
-#endif
+#if defined(_LIBCPP_NONUNIQUE_RTTI_BIT) && !defined(_LIBCPP_ABI_MICROSOFT)
+# define _LIBCPP_HAS_NONUNIQUE_TYPEINFO
#endif
namespace std // purposefully not using versioning namespace
OpenPOWER on IntegriCloud