Bug#667424: xsd: ftbfs with GCC-4.7: please perform NMU

[Boris Kolpackov]

gregor herrmann <gre...@debian.org> writes:

> I had a look at this bug/patch/package but it still FTBFS with the
> patch (this time in the test suite).

Attached is a patch that fixes the test suite issues.

Boris

diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
index 3dd1a82..6e138ab 100644
--- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
+++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
@@ -20,7 +20,7 @@ namespace xsd
                              const ro_string<C>& name,
                              const ro_string<C>* type)
         {
-          _start_any_element (ns, name, type);
+          this->_start_any_element (ns, name, type);
           this->complex_content<C>::context_.top ().any_ = true;
           return true;
         }
@@ -30,7 +30,7 @@ namespace xsd
         _end_element_impl (const ro_string<C>& ns, const ro_string<C>& name)
         {
           this->complex_content<C>::context_.top ().any_ = false;
-          _end_any_element (ns, name);
+          this->_end_any_element (ns, name);
           return true;
         }
 
@@ -41,7 +41,7 @@ namespace xsd
                          const ro_string<C>& name,
                          const ro_string<C>& value)
         {
-          _any_attribute (ns, name, value);
+          this->_any_attribute (ns, name, value);
           return true;
         }
 
@@ -49,7 +49,7 @@ namespace xsd
         bool any_type_pskel<C>::
         _characters_impl (const ro_string<C>& s)
         {
-          _any_characters (s);
+          this->_any_characters (s);
           return true;
         }
 
@@ -60,7 +60,7 @@ namespace xsd
         bool any_simple_type_pskel<C>::
         _characters_impl (const ro_string<C>& s)
         {
-          _any_characters (s);
+          this->_any_characters (s);
           return true;
         }
       }
diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx
index 28c45a8..43366a3 100644
--- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx
+++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx
@@ -20,7 +20,7 @@ namespace xsd
                              const ro_string<C>& name,
                              const ro_string<C>* type)
         {
-          _start_any_element (ns, name, type);
+          this->_start_any_element (ns, name, type);
           this->complex_content<C>::context_.top ().any_ = true;
           return true;
         }
@@ -30,7 +30,7 @@ namespace xsd
         _end_element_impl (const ro_string<C>& ns, const ro_string<C>& name)
         {
           this->complex_content<C>::context_.top ().any_ = false;
-          _end_any_element (ns, name);
+          this->_end_any_element (ns, name);
           return true;
         }
 
@@ -41,7 +41,7 @@ namespace xsd
                                    const ro_string<C>& name,
                                    const ro_string<C>& value)
         {
-          _any_attribute (ns, name, value);
+          this->_any_attribute (ns, name, value);
           return true;
         }
 
@@ -49,7 +49,7 @@ namespace xsd
         bool any_type_pskel<C>::
         _characters_impl (const ro_string<C>& s)
         {
-          _any_characters (s);
+          this->_any_characters (s);
           return true;
         }
 
@@ -60,7 +60,7 @@ namespace xsd
         bool any_simple_type_pskel<C>::
         _characters_impl (const ro_string<C>& s)
         {
-          _any_characters (s);
+          this->_any_characters (s);
           return true;
         }
       }
diff --git a/libxsd/xsd/cxx/tree/stream-extraction.hxx b/libxsd/xsd/cxx/tree/stream-extraction.hxx
index e8f1368..eef60ca 100644
--- a/libxsd/xsd/cxx/tree/stream-extraction.hxx
+++ b/libxsd/xsd/cxx/tree/stream-extraction.hxx
@@ -68,7 +68,7 @@ namespace xsd
           while (size--)
           {
             std::auto_ptr<T> p (new T (s, f, c));
-            push_back (p);
+            this->push_back (p);
           }
         }
       }
@@ -91,7 +91,7 @@ namespace xsd
           {
             T x;
             s >> x;
-            push_back (x);
+            this->push_back (x);
           }
         }
       }
diff --git a/libxsd/xsd/cxx/tree/parsing.txx b/libxsd/xsd/cxx/tree/parsing.txx
index bdeb539..e8bca99 100644
--- a/libxsd/xsd/cxx/tree/parsing.txx
+++ b/libxsd/xsd/cxx/tree/parsing.txx
@@ -303,7 +303,7 @@ namespace xsd
 
           if (j != basic_string<C>::npos)
           {
-            push_back (
+            this->push_back (
               traits<T, C, ST>::create (
                 basic_string<C> (data + i, j - i), parent, 0, 0));
 
@@ -313,7 +313,7 @@ namespace xsd
           {
             // Last element.
             //
-            push_back (
+            this->push_back (
               traits<T, C, ST>::create (
                 basic_string<C> (data + i, size - i), parent, 0, 0));