| Index: Source/platform/Supplementable.h
|
| diff --git a/Source/platform/Supplementable.h b/Source/platform/Supplementable.h
|
| index aa7322710921d265d17a67276f4b8d928403b1dd..eac9f5e9f8adae336a47a7e2f7c0b2873230f00d 100644
|
| --- a/Source/platform/Supplementable.h
|
| +++ b/Source/platform/Supplementable.h
|
| @@ -32,7 +32,7 @@
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/PassOwnPtr.h"
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| #include "wtf/Threading.h"
|
| #endif
|
|
|
| @@ -124,7 +124,7 @@ public:
|
| template<typename T, bool isGarbageCollected = false>
|
| class SupplementBase : public SupplementTracing<isGarbageCollected> {
|
| public:
|
| -#if SECURITY_ASSERT_ENABLED
|
| +#if ENABLE(SECURITY_ASSERT)
|
| virtual bool isRefCountedWrapper() const { return false; }
|
| #endif
|
|
|
| @@ -183,7 +183,7 @@ public:
|
|
|
| void reattachThread()
|
| {
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| m_threadId = currentThread();
|
| #endif
|
| }
|
| @@ -202,7 +202,7 @@ protected:
|
| GC_PLUGIN_IGNORE("")
|
| typename SupplementableTraits<T, isGarbageCollected>::SupplementMap m_supplements;
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| protected:
|
| SupplementableBase() : m_threadId(currentThread()) { }
|
|
|
|
|