From a066f175060a6ada5c60c378ca4dab6e9b571e35 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 19 Sep 2014 10:19:48 +0200 Subject: Don't use using namespace xercesc because of MSXML conflict --- libxsd/xsd/cxx/tree/serialization.txx | 10 ++++++++-- libxsd/xsd/cxx/tree/types.txx | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'libxsd/xsd/cxx/tree') 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 base64_binary:: encode () const { - using namespace xercesc; + // Cannot use 'using namespace' because of MSXML conflict. + // + using xercesc::Base64; + std::basic_string str; XMLSize_t n; @@ -357,7 +360,9 @@ namespace xsd void base64_binary:: 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; -- cgit v1.1