aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-07-15 10:12:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-07-15 10:12:48 +0200
commita85f023588472d3f4747a37d21fea57ce45b7546 (patch)
treeec9a9b5534b96baa1767d53b4e9008ead76d328e
parentdcd5ad9bfcf5aecd80139f4f4a5d6abc957b2cff (diff)
Qualify name to work around bug in VC8
-rw-r--r--libxsd/xsd/cxx/tree/parsing.txx14
-rw-r--r--libxsd/xsd/cxx/tree/parsing/boolean.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/byte.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/date-time.txx18
-rw-r--r--libxsd/xsd/cxx/tree/parsing/decimal.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/double.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/float.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/int.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/long.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/short.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx2
-rw-r--r--libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx2
14 files changed, 28 insertions, 28 deletions
diff --git a/libxsd/xsd/cxx/tree/parsing.txx b/libxsd/xsd/cxx/tree/parsing.txx
index 02aeda1..73e06f4 100644
--- a/libxsd/xsd/cxx/tree/parsing.txx
+++ b/libxsd/xsd/cxx/tree/parsing.txx
@@ -182,7 +182,7 @@ namespace xsd
list (const xercesc::DOMElement& e, flags f, container* c)
: sequence<T> (c)
{
- init (text_content<C> (e), &e, f & ~flags::keep_dom);
+ init (tree::text_content<C> (e), &e, f & ~flags::keep_dom);
}
template <typename T, typename C, schema_type::value ST>
@@ -260,7 +260,7 @@ namespace xsd
list (const xercesc::DOMElement& e, flags, container* c)
: sequence<T> (c)
{
- init (text_content<C> (e), &e);
+ init (tree::text_content<C> (e), &e);
}
template <typename T, typename C, schema_type::value ST>
@@ -334,7 +334,7 @@ namespace xsd
string<C, B>::
string (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c),
- base_type (text_content<C> (e))
+ base_type (tree::text_content<C> (e))
{
}
@@ -701,7 +701,7 @@ namespace xsd
uri<C, B>::
uri (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c),
- base_type (trim (text_content<C> (e)))
+ base_type (trim (tree::text_content<C> (e)))
{
}
@@ -731,7 +731,7 @@ namespace xsd
qname (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- std::basic_string<C> v (trim (text_content<C> (e)));
+ std::basic_string<C> v (trim (tree::text_content<C> (e)));
ns_ = resolve (v, &e);
name_ = xml::uq_name (v);
}
@@ -802,7 +802,7 @@ namespace xsd
{
// This implementation is not optimal.
//
- std::basic_string<C> str (trim (text_content<C> (e)));
+ std::basic_string<C> str (trim (tree::text_content<C> (e)));
decode (xml::string (str).c_str ());
}
@@ -837,7 +837,7 @@ namespace xsd
{
// This implementation is not optimal.
//
- std::basic_string<C> str (trim (text_content<C> (e)));
+ std::basic_string<C> str (trim (tree::text_content<C> (e)));
decode (xml::string (str).c_str ());
}
diff --git a/libxsd/xsd/cxx/tree/parsing/boolean.hxx b/libxsd/xsd/cxx/tree/parsing/boolean.hxx
index b2de5c9..8bbd3a8 100644
--- a/libxsd/xsd/cxx/tree/parsing/boolean.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/boolean.hxx
@@ -41,7 +41,7 @@ namespace xsd
bool traits<bool, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/byte.hxx b/libxsd/xsd/cxx/tree/parsing/byte.hxx
index 1ea54c3..d6cf1d3 100644
--- a/libxsd/xsd/cxx/tree/parsing/byte.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/byte.hxx
@@ -40,7 +40,7 @@ namespace xsd
signed char traits<signed char, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/date-time.txx b/libxsd/xsd/cxx/tree/parsing/date-time.txx
index 20d5d1c..29b12b6 100644
--- a/libxsd/xsd/cxx/tree/parsing/date-time.txx
+++ b/libxsd/xsd/cxx/tree/parsing/date-time.txx
@@ -59,7 +59,7 @@ namespace xsd
gday (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -109,7 +109,7 @@ namespace xsd
gmonth (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -159,7 +159,7 @@ namespace xsd
gyear (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -222,7 +222,7 @@ namespace xsd
gmonth_day (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -273,7 +273,7 @@ namespace xsd
gyear_month (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -337,7 +337,7 @@ namespace xsd
date (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -402,7 +402,7 @@ namespace xsd
time (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -469,7 +469,7 @@ namespace xsd
date_time (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
@@ -556,7 +556,7 @@ namespace xsd
duration (const xercesc::DOMElement& e, flags f, container* c)
: B (e, f, c)
{
- parse (text_content<C> (e));
+ parse (tree::text_content<C> (e));
}
template <typename C, typename B>
diff --git a/libxsd/xsd/cxx/tree/parsing/decimal.hxx b/libxsd/xsd/cxx/tree/parsing/decimal.hxx
index 5285e28..b615d3c 100644
--- a/libxsd/xsd/cxx/tree/parsing/decimal.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/decimal.hxx
@@ -44,7 +44,7 @@ namespace xsd
double traits<double, C, schema_type::decimal>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/double.hxx b/libxsd/xsd/cxx/tree/parsing/double.hxx
index 2b4b4f0..4466f7d 100644
--- a/libxsd/xsd/cxx/tree/parsing/double.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/double.hxx
@@ -44,7 +44,7 @@ namespace xsd
double traits<double, C, schema_type::double_>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/float.hxx b/libxsd/xsd/cxx/tree/parsing/float.hxx
index f9d1eb3..ee582e5 100644
--- a/libxsd/xsd/cxx/tree/parsing/float.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/float.hxx
@@ -44,7 +44,7 @@ namespace xsd
float traits<float, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/int.hxx b/libxsd/xsd/cxx/tree/parsing/int.hxx
index 673469f..b4eec88 100644
--- a/libxsd/xsd/cxx/tree/parsing/int.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/int.hxx
@@ -40,7 +40,7 @@ namespace xsd
int traits<int, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/long.hxx b/libxsd/xsd/cxx/tree/parsing/long.hxx
index fa6b7a6..070e66d 100644
--- a/libxsd/xsd/cxx/tree/parsing/long.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/long.hxx
@@ -40,7 +40,7 @@ namespace xsd
long long traits<long long, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/short.hxx b/libxsd/xsd/cxx/tree/parsing/short.hxx
index b597d8e..90d5144 100644
--- a/libxsd/xsd/cxx/tree/parsing/short.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/short.hxx
@@ -40,7 +40,7 @@ namespace xsd
short traits<short, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx
index 08dff1c..c172e93 100644
--- a/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx
@@ -40,7 +40,7 @@ namespace xsd
unsigned char traits<unsigned char, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx
index a17c178..07fb7f2 100644
--- a/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx
@@ -40,7 +40,7 @@ namespace xsd
unsigned int traits<unsigned int, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx
index 1547714..0036e0d 100644
--- a/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx
@@ -40,7 +40,7 @@ namespace xsd
unsigned long long traits<unsigned long long, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>
diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx
index 50f9a5c..838a2a8 100644
--- a/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx
+++ b/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx
@@ -40,7 +40,7 @@ namespace xsd
unsigned short traits<unsigned short, C, schema_type::other>::
create (const xercesc::DOMElement& e, flags f, container* c)
{
- return create (text_content<C> (e), 0, f, c);
+ return create (tree::text_content<C> (e), 0, f, c);
}
template <typename C>