[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 0b9248ca87a3634f5671bb54aaec527fdc929a39
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 16 19:21:57 2002 +0000

    	Fix the Development build.
    
            * kjs/object.cpp: Take out a use of ReferenceType.
    
            * kjs/ustring.h: Added a bit more inlining.
            * kjs/ustring.cpp: Moved the function out of here.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4d14079..e471127 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	Fix the Development build.
+
+        * kjs/object.cpp: Take out a use of ReferenceType.
+
+        * kjs/ustring.h: Added a bit more inlining.
+        * kjs/ustring.cpp: Moved the function out of here.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
 	Final step of the Reference change. Completely separate Reference
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 4d14079..e471127 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	Fix the Development build.
+
+        * kjs/object.cpp: Take out a use of ReferenceType.
+
+        * kjs/ustring.h: Added a bit more inlining.
+        * kjs/ustring.cpp: Moved the function out of here.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
 	Final step of the Reference change. Completely separate Reference
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 4d14079..e471127 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	Fix the Development build.
+
+        * kjs/object.cpp: Take out a use of ReferenceType.
+
+        * kjs/ustring.h: Added a bit more inlining.
+        * kjs/ustring.cpp: Moved the function out of here.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
 	Final step of the Reference change. Completely separate Reference
diff --git a/JavaScriptCore/kjs/object.cpp b/JavaScriptCore/kjs/object.cpp
index f9fb7de..a031ace 100644
--- a/JavaScriptCore/kjs/object.cpp
+++ b/JavaScriptCore/kjs/object.cpp
@@ -193,7 +193,6 @@ void ObjectImp::put(ExecState *exec, const UString &propertyName,
                      const Value &value, int attr)
 {
   assert(!value.isNull());
-  assert(value.type() != ReferenceType);
   assert(value.type() != CompletionType);
   assert(value.type() != ListType);
 
diff --git a/JavaScriptCore/kjs/ustring.cpp b/JavaScriptCore/kjs/ustring.cpp
index 503faef..d88c06e 100644
--- a/JavaScriptCore/kjs/ustring.cpp
+++ b/JavaScriptCore/kjs/ustring.cpp
@@ -113,7 +113,7 @@ bool KJS::operator==(const KJS::CString& c1, const KJS::CString& c2)
   return (strcmp(c1.c_str(), c2.c_str()) == 0);
 }
 
-UChar UChar::null;
+UChar UChar::null((char)0);
 UString::Rep UString::Rep::null = { 0, 0, 0, 1 };
 UString::Rep UString::Rep::empty = { 0, 0, 0, 1 };
 UString UString::null;
@@ -121,11 +121,6 @@ const int normalStatBufferSize = 4096;
 static char *statBuffer = 0;
 static int statBufferSize = 0;
 
-UChar::UChar(const UCharReference &c)
-    : uc( c.unicode() )
-{
-}
-
 UChar UChar::toLower() const
 {
   // ### properly support unicode tolower
diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/kjs/ustring.h
index c573783..7bc24c0 100644
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/kjs/ustring.h
@@ -169,6 +169,8 @@ namespace KJS {
     int offset;
   };
 
+  inline UChar::UChar(const UCharReference &c) : uc(c.unicode()) { }
+
   /**
    * @short 8 bit char based string class
    */

-- 
WebKit Debian packaging