[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 28e2b6e131fb5edb259d911857ed9df121666562
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 07:41:49 2009 +0000

    2009-10-02  Dave MacLachlan  <dmaclach at gmail.com>
    
            Reviewed by David Levin.
    
            Clean up warnings in WebCore/bindings/v8/npruntime.cpp
            https://bugs.webkit.org/show_bug.cgi?id=29971
    
            Gets rid of warnings on gcc about using anonymous namespaces
              warning: 'StringKeyHashTraits' has a base
              'WTF::GenericHashTraits<<unnamed>::StringKey>'
              whose type uses the anonymous namespace
            and
              warning: 'WTF::PairHashTraits<StringKeyHashTraits,
              WTF::HashTraits<PrivateIdentifier*> >' has a base
              'WTF::GenericHashTraits<std::pair<<unnamed>::StringKey,
              PrivateIdentifier*> >' whose type uses the anonymous namespace
    
            No tests required.
    
            * bindings/v8/npruntime.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 11acf95..e9ce08f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2009-10-02  Dave MacLachlan  <dmaclach at gmail.com>
+
+        Reviewed by David Levin.
+
+        Clean up warnings in WebCore/bindings/v8/npruntime.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=29971
+
+        Gets rid of warnings on gcc about using anonymous namespaces 
+          warning: 'StringKeyHashTraits' has a base
+          'WTF::GenericHashTraits<<unnamed>::StringKey>' 
+          whose type uses the anonymous namespace
+        and
+          warning: 'WTF::PairHashTraits<StringKeyHashTraits,
+          WTF::HashTraits<PrivateIdentifier*> >' has a base
+          'WTF::GenericHashTraits<std::pair<<unnamed>::StringKey,
+          PrivateIdentifier*> >' whose type uses the anonymous namespace
+
+        No tests required.
+
+        * bindings/v8/npruntime.cpp:
+
 2009-10-01  Mark Rowe  <mrowe at apple.com>
 
         Fix the Tiger build.  Don't unconditionally enable 3D canvas as it is not supported on Tiger.
diff --git a/WebCore/bindings/v8/npruntime.cpp b/WebCore/bindings/v8/npruntime.cpp
index 64a1927..3ae2e70 100644
--- a/WebCore/bindings/v8/npruntime.cpp
+++ b/WebCore/bindings/v8/npruntime.cpp
@@ -39,7 +39,7 @@
 // The static initializer here should work okay, but we want to avoid
 // static initialization in general.
 
-namespace {
+namespace npruntime {
 
 // We use StringKey here as the key-type to avoid a string copy to
 // construct the map key and for faster comparisons than strcmp.
@@ -112,7 +112,10 @@ struct StringKeyHash {
     static const bool safeToCompareToEmptyOrDeleted = true;
 };
 
-}  // namespace
+}  // namespace npruntime
+
+using npruntime::StringKey;
+using npruntime::StringKeyHash;
 
 // Implement HashTraits<StringKey>
 struct StringKeyHashTraits : WTF::GenericHashTraits<StringKey> {

-- 
WebKit Debian packaging