aboutsummaryrefslogtreecommitdiff
path: root/libxsd/xsd/cxx/tree
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-09-19 10:19:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-09-19 10:19:48 +0200
commita066f175060a6ada5c60c378ca4dab6e9b571e35 (patch)
treeee2d1d119306d9d9cba390e6e93543f11993af9f /libxsd/xsd/cxx/tree
parent169b95d1c079bcc12c2a9bc881ecf2cccf0b6029 (diff)
Don't use using namespace xercesc because of MSXML conflict
Diffstat (limited to 'libxsd/xsd/cxx/tree')
-rw-r--r--libxsd/xsd/cxx/tree/serialization.txx10
-rw-r--r--libxsd/xsd/cxx/tree/types.txx9
2 files changed, 15 insertions, 4 deletions
diff --git a/libxsd/xsd/cxx/tree/serialization.txx b/libxsd/xsd/cxx/tree/serialization.txx
index 055f603..ef0a44c 100644
--- a/libxsd/xsd/cxx/tree/serialization.txx
+++ b/libxsd/xsd/cxx/tree/serialization.txx
@@ -97,10 +97,16 @@ namespace xsd
if (!x.null_content () && x.dom_content ().present ())
{
- // Clone the contents of the element.
+ // Cannot use 'using namespace' because of MSXML conflict.
//
- using namespace xercesc;
+ using xercesc::DOMAttr;
+ using xercesc::DOMNode;
+ using xercesc::DOMElement;
+ using xercesc::DOMDocument;
+ using xercesc::DOMNamedNodeMap;
+ // Clone the contents of the element.
+ //
DOMDocument& doc (*e.getOwnerDocument ());
const DOMElement& se (x.dom_content ().get ());
DOMNamedNodeMap& sa (*se.getAttributes ());
diff --git a/libxsd/xsd/cxx/tree/types.txx b/libxsd/xsd/cxx/tree/types.txx
index 8696171..a5ef95d 100644
--- a/libxsd/xsd/cxx/tree/types.txx
+++ b/libxsd/xsd/cxx/tree/types.txx
@@ -319,7 +319,10 @@ namespace xsd
std::basic_string<C> base64_binary<C, B>::
encode () const
{
- using namespace xercesc;
+ // Cannot use 'using namespace' because of MSXML conflict.
+ //
+ using xercesc::Base64;
+
std::basic_string<C> str;
XMLSize_t n;
@@ -357,7 +360,9 @@ namespace xsd
void base64_binary<C, B>::
decode (const XMLCh* src)
{
- using namespace xercesc;
+ // Cannot use 'using namespace' because of MSXML conflict.
+ //
+ using xercesc::Base64;
xml::std_memory_manager mm;
XMLSize_t size;