[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 cb72b221166dbc5f4cf702f8fa64c2ae7450f0d5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 14 01:41:14 2003 +0000

            - remove mistaken inlining to fix build with newer versions of gcc
    
            * khtml/rendering/render_object.cpp: (RenderObject::container):
            Don't mark this inline.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fc036ae..991449d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-03-13  Darin Adler  <darin at apple.com>
+
+        - remove mistaken inlining to fix build with newer versions of gcc
+
+        * khtml/rendering/render_object.cpp: (RenderObject::container):
+        Don't mark this inline.
+
 2003-03-13  David Hyatt  <hyatt at apple.com>
 
 	This is a fix to stop creating textruns for the whitespace at the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fc036ae..991449d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-03-13  Darin Adler  <darin at apple.com>
+
+        - remove mistaken inlining to fix build with newer versions of gcc
+
+        * khtml/rendering/render_object.cpp: (RenderObject::container):
+        Don't mark this inline.
+
 2003-03-13  David Hyatt  <hyatt at apple.com>
 
 	This is a fix to stop creating textruns for the whitespace at the
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 53ded75..5de7637 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1014,8 +1014,7 @@ RenderRoot* RenderObject::root() const
     return static_cast<RenderRoot*>( o );
 }
 
-// Inlined because it is called by setLayouted below.
-inline RenderObject *RenderObject::container() const
+RenderObject *RenderObject::container() const
 {
     EPosition pos = m_style->position();
     RenderObject *o = 0;

-- 
WebKit Debian packaging