From 056132a85b7a337e2ce288e9df07abd6a34e367d Mon Sep 17 00:00:00 2001 From: "peterv%propagandism.org" Date: Wed, 21 Jan 2004 12:25:50 +0000 Subject: [PATCH] Rename verify to verifyThread to fix OS X debug build bustage. git-svn-id: svn://10.0.0.236/trunk@151637 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/string/public/nsBufferHandle.h | 6 +++--- mozilla/xpcom/string/src/nsBufferHandle.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/xpcom/string/public/nsBufferHandle.h b/mozilla/xpcom/string/public/nsBufferHandle.h index 1674ea60469..0b2c04b9b79 100755 --- a/mozilla/xpcom/string/public/nsBufferHandle.h +++ b/mozilla/xpcom/string/public/nsBufferHandle.h @@ -188,7 +188,7 @@ class nsSingleThreadVerifier { public: nsSingleThreadVerifier(); - void verify() const; + void verifyThread() const; protected: void* mThread; }; @@ -284,7 +284,7 @@ class nsSharedBufferHandle get_refcount() const { #ifdef DEBUG - mSingleThreadVerifier.verify(); + mSingleThreadVerifier.verifyThread(); #endif return mFlags & kRefCountMask; } @@ -293,7 +293,7 @@ class nsSharedBufferHandle set_refcount( PRUint32 aNewRefCount ) { #ifdef DEBUG - mSingleThreadVerifier.verify(); + mSingleThreadVerifier.verifyThread(); #endif NS_ASSERTION(aNewRefCount <= kRefCountMask, "aNewRefCount <= kRefCountMask"); diff --git a/mozilla/xpcom/string/src/nsBufferHandle.cpp b/mozilla/xpcom/string/src/nsBufferHandle.cpp index e4565ab55a1..37bf727041a 100644 --- a/mozilla/xpcom/string/src/nsBufferHandle.cpp +++ b/mozilla/xpcom/string/src/nsBufferHandle.cpp @@ -46,7 +46,7 @@ nsSingleThreadVerifier::nsSingleThreadVerifier() mThread = PR_GetCurrentThread(); } -void nsSingleThreadVerifier::verify() const +void nsSingleThreadVerifier::verifyThread() const { NS_ASSERTION(mThread == PR_GetCurrentThread(), "sharable string being used on multiple threads");