From a6f85da576d5d1fafce01bb6c3070c408adba913 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 6 Apr 2012 15:22:19 +0200
Subject: Fix template argument-dependant lookup errors (GCC 4.7 and Clang)

---
 libxsd/xsd/cxx/parser/validating/parser.txx | 50 ++++++++++++++---------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'libxsd/xsd/cxx/parser/validating/parser.txx')

diff --git a/libxsd/xsd/cxx/parser/validating/parser.txx b/libxsd/xsd/cxx/parser/validating/parser.txx
index 1f7a898..54a1968 100644
--- a/libxsd/xsd/cxx/parser/validating/parser.txx
+++ b/libxsd/xsd/cxx/parser/validating/parser.txx
@@ -93,8 +93,8 @@ namespace xsd
                         const ro_string<C>& name,
                         const ro_string<C>* type)
         {
-          if (!_start_element_impl (ns, name, type))
-            _unexpected_element (ns, name);
+          if (!this->_start_element_impl (ns, name, type))
+            this->_unexpected_element (ns, name);
         }
 
         template <typename C>
@@ -102,8 +102,8 @@ namespace xsd
         _end_element (const ro_string<C>& ns,
                       const ro_string<C>& name)
         {
-          if (!_end_element_impl (ns, name))
-            _unexpected_element (ns, name);
+          if (!this->_end_element_impl (ns, name))
+            this->_unexpected_element (ns, name);
         }
 
         template <typename C>
@@ -129,16 +129,16 @@ namespace xsd
           if (ns == xml::bits::xmlns_namespace<C> ())
             return;
 
-          if (!_attribute_impl (ns, name, value))
-            _unexpected_attribute (ns, name, value);
+          if (!this->_attribute_impl (ns, name, value))
+            this->_unexpected_attribute (ns, name, value);
         }
 
         template <typename C>
         void empty_content<C>::
         _characters (const ro_string<C>& s)
         {
-          if (!_characters_impl (s))
-            _unexpected_characters (s);
+          if (!this->_characters_impl (s))
+            this->_unexpected_characters (s);
         }
 
         //
@@ -218,15 +218,15 @@ namespace xsd
           if (ns == xml::bits::xmlns_namespace<C> ())
             return;
 
-          if (!_attribute_impl (ns, name, value))
-            _unexpected_attribute (ns, name, value);
+          if (!this->_attribute_impl (ns, name, value))
+            this->_unexpected_attribute (ns, name, value);
         }
 
         template <typename C>
         void simple_content<C>::
         _characters (const ro_string<C>& str)
         {
-          if (!_characters_impl (str))
+          if (!this->_characters_impl (str))
           {
             // Mixed content is implemented in the generated code
             // by overriding _characters_impl and forwarding to
@@ -245,7 +245,7 @@ namespace xsd
                   c != C (0x0D) && // carriage return
                   c != C (0x09) && // tab
                   c != C (0x0A))
-                _unexpected_characters (str);
+                this->_unexpected_characters (str);
             }
           }
         }
@@ -322,14 +322,14 @@ namespace xsd
           if (s.depth_++ > 0)
           {
             if (s.any_)
-              _start_any_element (ns, name, type);
+              this->_start_any_element (ns, name, type);
             else if (s.parser_)
               s.parser_->_start_element (ns, name, type);
           }
           else
           {
-            if (!_start_element_impl (ns, name, type))
-              _unexpected_element (ns, name);
+            if (!this->_start_element_impl (ns, name, type))
+              this->_unexpected_element (ns, name);
             else if (s.parser_ != 0)
               s.parser_->_pre_impl ();
           }
@@ -364,7 +364,7 @@ namespace xsd
 
               this->_post_impl ();
 
-              if (!_end_element_impl (ns, name))
+              if (!this->_end_element_impl (ns, name))
                 assert (false);
             }
           }
@@ -375,7 +375,7 @@ namespace xsd
             if (--s.depth_ > 0)
             {
               if (s.any_)
-                _end_any_element (ns, name);
+                this->_end_any_element (ns, name);
               else if (s.parser_)
                 s.parser_->_end_element (ns, name);
             }
@@ -384,8 +384,8 @@ namespace xsd
               if (s.parser_ != 0 && !s.any_)
                 s.parser_->_post_impl ();
 
-              if (!_end_element_impl (ns, name))
-                _unexpected_element (ns, name);
+              if (!this->_end_element_impl (ns, name))
+                this->_unexpected_element (ns, name);
             }
           }
         }
@@ -418,14 +418,14 @@ namespace xsd
           if (s.depth_ > 0)
           {
             if (s.any_)
-              _any_attribute (ns, name, value);
+              this->_any_attribute (ns, name, value);
             else if (s.parser_)
               s.parser_->_attribute (ns, name, value);
           }
           else
           {
-            if (!_attribute_impl (ns, name, value))
-              _unexpected_attribute (ns, name, value);
+            if (!this->_attribute_impl (ns, name, value))
+              this->_unexpected_attribute (ns, name, value);
           }
         }
 
@@ -438,13 +438,13 @@ namespace xsd
           if (s.depth_ > 0)
           {
             if (s.any_)
-              _any_characters (str);
+              this->_any_characters (str);
             else if (s.parser_)
               s.parser_->_characters (str);
           }
           else
           {
-            if (!_characters_impl (str))
+            if (!this->_characters_impl (str))
             {
               // Mixed content is implemented in the generated code
               // by overriding _characters_impl and forwarding to
@@ -463,7 +463,7 @@ namespace xsd
                     c != C (0x0D) && // carriage return
                     c != C (0x09) && // tab
                     c != C (0x0A))
-                  _unexpected_characters (str);
+                  this->_unexpected_characters (str);
               }
             }
           }
-- 
cgit v1.1