2011-05-06 Alexis Menard <alexis.menard@openbossa.org>

        Reviewed by Alexey Proskuryakov.

        Build fix with gcc 4.6 and c++0x support.
        https://bugs.webkit.org/show_bug.cgi?id=60284

        When enabling support of c++0x the compilation fails because of an
        ambiguous overload error. In this code when constructing the pair
        we use the new c++0x rvalue reference feature (&&). It means we are
        calling String(const WTF::AtomicString&) which becomes ambiguous because
        it has an overload WTF::String::String(const WTF::String&) and usually one
        with the native port string type (e.g. QString). In this code we want the
        String version because the pair store Strings.

        No new tests, build fix.

        * loader/FormSubmission.cpp:
        (WebCore::FormSubmission::create):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 121cfe8..c52e2cf 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2011-05-06  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Build fix with gcc 4.6 and c++0x support.
+        https://bugs.webkit.org/show_bug.cgi?id=60284
+
+        When enabling support of c++0x the compilation fails because of an
+        ambiguous overload error. In this code when constructing the pair
+        we use the new c++0x rvalue reference feature (&&). It means we are
+        calling String(const WTF::AtomicString&) which becomes ambiguous because
+        it has an overload WTF::String::String(const WTF::String&) and usually one
+        with the native port string type (e.g. QString). In this code we want the
+        String version because the pair store Strings.
+
+        No new tests, build fix.
+
+        * loader/FormSubmission.cpp:
+        (WebCore::FormSubmission::create):
+
 2011-05-06  Cris Neckar  <cdn@chromium.org>
 
         Reviewed by Dirk Schulze.

diff --git a/Source/WebCore/loader/FormSubmission.cpp b/Source/WebCore/loader/FormSubmission.cpp
index 44f9ff1..0138494 100644 (file)
--- a/Source/WebCore/loader/FormSubmission.cpp
+++ b/Source/WebCore/loader/FormSubmission.cpp
@@ -182,7 +182,7 @@ PassRefPtr<FormSubmission> FormSubmission::create(HTMLFormElement* form, const A
         if (element->hasLocalName(inputTag)) {
             HTMLInputElement* input = static_cast<HTMLInputElement*>(control);
             if (input->isTextField()) {
-                formValues.append(pair<String, String>(input->name(), input->value()));
+                formValues.append(pair<String, String>(input->name().string(), input->value()));
                 if (input->isSearchField())
                     input->addSearchResult();
             }