Detect RTTI properly on Clang.

This was giving a compile error on OSX. Also update the logic slightly. BUG=angleproject:963 Change-Id: I1ac64aa0908a58d9780054084d5c205c61848763 Reviewed-on: https://chromium-review.googlesource.com/263730Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Detect RTTI properly on Clang.
6c7a80d8 · Jamie Madill · 99f075da · 6c7a80d8
Commit 6c7a80d8 authored Apr 02, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

debug.h src/common/debug.h +12 -3

No files found.
--- a/src/common/debug.h
+++ b/src/common/debug.h
@@ -150,10 +150,19 @@ bool DebugAnnotationsActive();
 #endif

 // A macro that determines whether an object has a given runtime type.
-#if !defined(NDEBUG) && (!defined(_MSC_VER) || defined(_CPPRTTI)) && (!defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || defined(__GXX_RTTI))
-#define HAS_DYNAMIC_TYPE(type, obj) (dynamic_cast<type >(obj) != NULL)
+#if defined(__clang__)
+#if __has_feature(cxx_rtti)
+#define ANGLE_HAS_DYNAMIC_CAST 1
+#endif
+#elif !defined(NDEBUG) && (!defined(_MSC_VER) || defined(_CPPRTTI)) && (!defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || defined(__GXX_RTTI))
+#define ANGLE_HAS_DYNAMIC_CAST 1
+#endif
+
+#ifdef ANGLE_HAS_DYNAMIC_CAST
+#define HAS_DYNAMIC_TYPE(type, obj) (dynamic_cast<type>(obj) != nullptr)
+#undef ANGLE_HAS_DYNAMIC_CAST
 #else
-#define HAS_DYNAMIC_TYPE(type, obj) true
+#define HAS_DYNAMIC_TYPE(type, obj) (obj != nullptr)
 #endif

 #endif   // COMMON_DEBUG_H_