Reviewed by John Sullivan.

        * kjs/SavedBuiltins.h: Added needed include.
        * wtf/OwnPtr.h: (WTF::OwnPtr::set): Fixed mistake in assertion.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3ce87310c2c17d672732964823cd9545d641c999..dde3839f39a3770a38b97a926ed3a128d9b21988 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-30  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        * kjs/SavedBuiltins.h: Added needed include.
+        * wtf/OwnPtr.h: (WTF::OwnPtr::set): Fixed mistake in assertion.
+
 2006-10-28  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/kjs/SavedBuiltins.h b/JavaScriptCore/kjs/SavedBuiltins.h
index c8967b36037d178a96c0815cea32dbb3fd541647..4b49635e3398d56347274af1cb1bd7f0a0d6efe2 100644 (file)
--- a/JavaScriptCore/kjs/SavedBuiltins.h
+++ b/JavaScriptCore/kjs/SavedBuiltins.h
@@ -25,6 +25,8 @@
 #ifndef SavedBuiltins_H
 #define SavedBuiltins_H
 
+#include "protect.h"
+
 namespace KJS {
     
 class SavedBuiltinsInternal;

diff --git a/JavaScriptCore/wtf/OwnPtr.h b/JavaScriptCore/wtf/OwnPtr.h
index e5f885e84e7d1b81993cab1a6492672a520c46e6..b949ddb13cf53dfc43b43baf68c15f25582dc7a5 100644 (file)
--- a/JavaScriptCore/wtf/OwnPtr.h
+++ b/JavaScriptCore/wtf/OwnPtr.h
@@ -36,7 +36,7 @@ namespace WTF {
         T* get() const { return m_ptr; }
         T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
 
-        void set(T* ptr) { ASSERT(m_ptr != ptr); safeDelete(); m_ptr = ptr; }
+        void set(T* ptr) { ASSERT(!ptr || m_ptr != ptr); safeDelete(); m_ptr = ptr; }
         void clear() { safeDelete(); m_ptr = 0; }
 
         T& operator*() const { ASSERT(m_ptr); return *m_ptr; }