diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-02-21 21:24:00 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-02-21 21:24:00 +0000 |
| commit | 9d3cb431f997477067757531d8c9b00181a72630 (patch) | |
| tree | 132d41800831c2caa066ed962590c46d1e0dddc3 /cpp/include/XMLTransform/XMLTransform.h | |
| parent | bug fix in endpoint parsing (diff) | |
| download | ice-9d3cb431f997477067757531d8c9b00181a72630.tar.bz2 ice-9d3cb431f997477067757531d8c9b00181a72630.tar.xz ice-9d3cb431f997477067757531d8c9b00181a72630.zip | |
portability fixes for openssl, xerces; dependency update
Diffstat (limited to 'cpp/include/XMLTransform/XMLTransform.h')
| -rw-r--r-- | cpp/include/XMLTransform/XMLTransform.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/cpp/include/XMLTransform/XMLTransform.h b/cpp/include/XMLTransform/XMLTransform.h index 4d7d2e9ac10..4042c1a0496 100644 --- a/cpp/include/XMLTransform/XMLTransform.h +++ b/cpp/include/XMLTransform/XMLTransform.h @@ -18,6 +18,7 @@ #include <Freeze/DB.h> #include <IceUtil/OutputUtil.h> +#include <Ice/Xerces.h> #include <xercesc/dom/DOM.hpp> #include <map> @@ -150,16 +151,16 @@ class XML_TRANSFORM_API DocumentInfo : public ::IceUtil::Shared { public: - DocumentInfo(DOMDocument*, bool, DOMNode*, const ::std::string& = ""); + DocumentInfo(ICE_XERCES_NS DOMDocument*, bool, ICE_XERCES_NS DOMNode*, const ::std::string& = ""); ~DocumentInfo(); - DOMDocument* getDocument() const; + ICE_XERCES_NS DOMDocument* getDocument() const; ::std::string findURI(const ::std::string& prefix) const; ::std::string getTargetNamespace() const; private: - DOMDocument* _document; + ICE_XERCES_NS DOMDocument* _document; bool _releaseDocument; PrefixURIMap _nsMap; ::std::string _targetNamespace; @@ -179,10 +180,10 @@ public: typedef ::std::map< ::std::string, ::std::string > MissingTypeMap; - virtual void transform(::IceUtil::XMLOutput&, const DocumentInfoPtr&, const ::std::string&, DOMNode*, - const MissingTypeMap&) = 0; - virtual void checkMissingTypes(const DocumentInfoPtr&, DOMNode*, const MissingTypeMap&) { } - virtual void collectMissingTypes(const DocumentInfoPtr&, DOMNode*, MissingTypeMap&) { } + virtual void transform(::IceUtil::XMLOutput&, const DocumentInfoPtr&, const ::std::string&, + ICE_XERCES_NS DOMNode*, const MissingTypeMap&) = 0; + virtual void checkMissingTypes(const DocumentInfoPtr&, ICE_XERCES_NS DOMNode*, const MissingTypeMap&) { } + virtual void collectMissingTypes(const DocumentInfoPtr&, ICE_XERCES_NS DOMNode*, MissingTypeMap&) { } virtual ::std::ostream& print(::std::ostream&) = 0; }; @@ -202,10 +203,10 @@ class XML_TRANSFORM_API Transformer public: Transformer(const Ice::StringSeq&, const Ice::StringSeq&, const Ice::StringSeq&, const Ice::StringSeq&, - DOMDocument*, DOMDocument*); + ICE_XERCES_NS DOMDocument*, ICE_XERCES_NS DOMDocument*); ~Transformer(); - void transform(::IceUtil::XMLOutput&, DOMDocument*, const std::string&, bool, bool = true); + void transform(::IceUtil::XMLOutput&, ICE_XERCES_NS DOMDocument*, const std::string&, bool, bool = true); private: @@ -245,7 +246,7 @@ public: private: - void transform(DOMDocument*, DOMDocument*); + void transform(ICE_XERCES_NS DOMDocument*, ICE_XERCES_NS DOMDocument*); Freeze::DBEnvironmentPtr _dbEnv; Freeze::DBPtr _db; |