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/non-validating/parser.txx | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'libxsd/xsd/cxx/parser/non-validating')

diff --git a/libxsd/xsd/cxx/parser/non-validating/parser.txx b/libxsd/xsd/cxx/parser/non-validating/parser.txx
index 3dcc7e5..329c0c9 100644
--- a/libxsd/xsd/cxx/parser/non-validating/parser.txx
+++ b/libxsd/xsd/cxx/parser/non-validating/parser.txx
@@ -164,15 +164,15 @@ namespace xsd
           if (ns == xml::bits::xmlns_namespace<C> ())
             return;
 
-          if (!_attribute_impl (ns, name, value))
-            _any_attribute (ns, name, value);
+          if (!this->_attribute_impl (ns, name, value))
+            this->_any_attribute (ns, name, value);
         }
 
         template <typename C>
         void simple_content<C>::
         _characters (const ro_string<C>& str)
         {
-          _characters_impl (str);
+          this->_characters_impl (str);
         }
 
 
@@ -190,15 +190,15 @@ 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))
+            if (!this->_start_element_impl (ns, name, type))
             {
-              _start_any_element (ns, name, type);
+              this->_start_any_element (ns, name, type);
               s.any_ = true;
             }
             else if (s.parser_ != 0)
@@ -235,7 +235,7 @@ namespace xsd
 
               this->_post_impl ();
 
-              if (!_end_element_impl (ns, name))
+              if (!this->_end_element_impl (ns, name))
                 assert (false);
             }
           }
@@ -246,7 +246,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);
             }
@@ -255,10 +255,10 @@ namespace xsd
               if (s.parser_ != 0 && !s.any_)
                 s.parser_->_post_impl ();
 
-              if (!_end_element_impl (ns, name))
+              if (!this->_end_element_impl (ns, name))
               {
                 s.any_ = false;
-                _end_any_element (ns, name);
+                this->_end_any_element (ns, name);
               }
             }
           }
@@ -292,14 +292,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))
-              _any_attribute (ns, name, value);
+            if (!this->_attribute_impl (ns, name, value))
+              this->_any_attribute (ns, name, value);
           }
         }
 
@@ -312,14 +312,14 @@ 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))
-              _any_characters (str);
+            if (!this->_characters_impl (str))
+              this->_any_characters (str);
           }
         }
 
-- 
cgit v1.1