dbertoni    2002/11/27 16:26:07

  Modified:    c/src/XercesParserLiaison XercesBridgeTypes.hpp
                        XercesDocumentBridge.cpp XercesDocumentBridge.hpp
                        XercesDocumentTypeBridge.cpp
                        XercesDocumentTypeBridge.hpp
                        XercesDocumentTypeWrapper.cpp
                        XercesDocumentTypeWrapper.hpp
                        XercesDocumentWrapper.cpp XercesDocumentWrapper.hpp
                        XercesParserLiaison.cpp XercesParserLiaison.hpp
                        XercesWrapperTypes.hpp
  Log:
  Make sure typedefs don't collide when C++ namespaces  are not supported.
  
  Revision  Changes    Path
  1.3       +3 -2      xml-xalan/c/src/XercesParserLiaison/XercesBridgeTypes.hpp
  
  Index: XercesBridgeTypes.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeTypes.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XercesBridgeTypes.hpp     26 Nov 2002 00:44:38 -0000      1.2
  +++ XercesBridgeTypes.hpp     28 Nov 2002 00:26:06 -0000      1.3
  @@ -99,8 +99,9 @@
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CharacterData     
DOM_CharacterDataType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Comment                   
DOM_CommentType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CDATASection              
DOM_CDATASectionType;
  -typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType              
DOM_DocTypeType;
  -typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document                  
DOM_DocumentType;
  +// These next two have an extra '_' because they collide without it...
  +typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType              
DOM_DocumentType_Type;
  +typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document                  
DOM_Document_Type;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment  
DOM_DocumentFragmentType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMImplementation 
DOM_DOMImplementationType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element                   
DOM_ElementType;
  
  
  
  1.28      +12 -12    
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
  
  Index: XercesDocumentBridge.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- XercesDocumentBridge.cpp  26 Nov 2002 00:44:38 -0000      1.27
  +++ XercesDocumentBridge.cpp  28 Nov 2002 00:26:06 -0000      1.28
  @@ -101,7 +101,7 @@
   
   
   XercesDocumentBridge::XercesDocumentBridge(
  -                     const DOM_DocumentType&         theXercesDocument,
  +                     const DOM_Document_Type&        theXercesDocument,
                        bool                                            
threadSafe,
                        bool                                            
buildBridge) :
        XalanDocument(),
  @@ -332,9 +332,9 @@
   
   XercesDocumentTypeBridge*
   XercesDocumentBridge::createBridgeNode(
  -                     const DOM_DocTypeType&  theDoctype,
  -                     unsigned long                   theIndex,
  -                     bool                                    mapNode) const
  +                     const DOM_DocumentType_Type&    theDoctype,
  +                     unsigned long                                   
theIndex,
  +                     bool                                                    
mapNode) const
   {
        // This is a special case, since there is only one
        // doctype node allowed...
  @@ -873,11 +873,11 @@
   
        case DOM_NodeType::DOCUMENT_TYPE_NODE:
                {
  -                     const DOM_DocTypeType&          theDoctypeNode =
  +                     const DOM_DocumentType_Type&    theDoctypeNode =
   #if defined(XALAN_OLD_STYLE_CASTS)
  -                                             (const 
DOM_DocTypeType&)theXercesNode;
  +                                             (const 
DOM_DocumentType_Type&)theXercesNode;
   #else
  -                                             static_cast<const 
DOM_DocTypeType&>(theXercesNode);
  +                                             static_cast<const 
DOM_DocumentType_Type&>(theXercesNode);
   #endif
   
                        theNewNode = createBridgeNode(theDoctypeNode, theIndex, 
mapNode);
  @@ -1062,9 +1062,9 @@
   
                theBridge =
   #if defined(XALAN_OLD_STYLE_CASTS)
  -                     new XercesDocumentBridge((const 
DOM_DocumentType&)theNewDocument);
  +                     new XercesDocumentBridge((const 
DOM_Document_Type&)theNewDocument);
   #else
  -                     new XercesDocumentBridge(static_cast<const 
DOM_DocumentType&>(theNewDocument));
  +                     new XercesDocumentBridge(static_cast<const 
DOM_Document_Type&>(theNewDocument));
   #endif
        }
        catch(const DOM_DOMExceptionType&       theException)
  @@ -1678,11 +1678,11 @@
        if (theType == DOM_NodeType::DOCUMENT_TYPE_NODE)
        {
                // Special case for doctype -- we have to build its entities...
  -             const DOM_DocTypeType&          theDoctype =
  +             const DOM_DocumentType_Type&    theDoctype =
   #if defined(XALAN_OLD_STYLE_CASTS)
  -                     (const DOM_DocTypeType&)node;
  +                     (const DOM_DocumentType_Type&)node;
   #else
  -                     static_cast<const DOM_DocTypeType&>(node);
  +                     static_cast<const DOM_DocumentType_Type&>(node);
   #endif
   
                const DOM_NamedNodeMapType      theEntities =
  
  
  
  1.24      +6 -6      
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
  
  Index: XercesDocumentBridge.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- XercesDocumentBridge.hpp  26 Nov 2002 00:44:38 -0000      1.23
  +++ XercesDocumentBridge.hpp  28 Nov 2002 00:26:07 -0000      1.24
  @@ -147,7 +147,7 @@
         *
         */
        XercesDocumentBridge(
  -                     const DOM_DocumentType&         theXercesDocument,
  +                     const DOM_Document_Type&        theXercesDocument,
                        bool                                            
threadSafe = true,
                        bool                                            
buildBridge = true);
   
  @@ -352,7 +352,7 @@
         * @return the Xerces DOM_Document instance.
         *
         */
  -     DOM_DocumentType
  +     DOM_Document_Type
        getXercesDocument() const
        {
                return m_xercesDocument;
  @@ -496,9 +496,9 @@
   
        XercesDocumentTypeBridge*
        createBridgeNode(
  -                     const DOM_DocTypeType&  theDoctype,
  -                     unsigned long                   theIndex,
  -                     bool                                    mapNode) const;
  +                     const DOM_DocumentType_Type&    theDoctype,
  +                     unsigned long                                   
theIndex,
  +                     bool                                                    
mapNode) const;
   
        XercesElementBridge*
        createBridgeNode(
  @@ -568,7 +568,7 @@
   
        // $$$ ToDo: This is because DOM_Document::getElementById() is not
        // const...
  -     mutable DOM_DocumentType                                
m_xercesDocument;
  +     mutable DOM_Document_Type                               
m_xercesDocument;
   
        XalanElement*                                                   
m_documentElement;
   
  
  
  
  1.9       +1 -1      
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp
  
  Index: XercesDocumentTypeBridge.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XercesDocumentTypeBridge.cpp      26 Nov 2002 00:44:38 -0000      1.8
  +++ XercesDocumentTypeBridge.cpp      28 Nov 2002 00:26:07 -0000      1.9
  @@ -73,7 +73,7 @@
   
   
   XercesDocumentTypeBridge::XercesDocumentTypeBridge(
  -                     const DOM_DocTypeType&                  
theXercesDOMDocumentType,
  +                     const DOM_DocumentType_Type&    
theXercesDOMDocumentType,
                        const XercesBridgeNavigator&    theNavigator) :
        XalanDocumentType(),
        m_xercesNode(theXercesDOMDocumentType),
  
  
  
  1.10      +3 -3      
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp
  
  Index: XercesDocumentTypeBridge.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XercesDocumentTypeBridge.hpp      26 Nov 2002 00:44:38 -0000      1.9
  +++ XercesDocumentTypeBridge.hpp      28 Nov 2002 00:26:07 -0000      1.10
  @@ -94,7 +94,7 @@
   public:
   
        XercesDocumentTypeBridge(
  -                     const DOM_DocTypeType&                  
theXercesDOMDocumentType,
  +                     const DOM_DocumentType_Type&    
theXercesDOMDocumentType,
                        const XercesBridgeNavigator&    theNavigator);
   
        virtual
  @@ -499,7 +499,7 @@
         *
         * @return The Xerces node
         */
  -     DOM_DocTypeType
  +     DOM_DocumentType_Type
        getXercesNode() const
        {
                return m_xercesNode;
  @@ -519,7 +519,7 @@
        operator==(const XercesDocumentTypeBridge&      theRHS) const;
   
        // Data members...
  -     DOM_DocTypeType                                 m_xercesNode;
  +     DOM_DocumentType_Type                   m_xercesNode;
   
        XercesNamedNodeMapBridge                m_entities;
        
  
  
  
  1.4       +1 -1      
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
  
  Index: XercesDocumentTypeWrapper.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XercesDocumentTypeWrapper.cpp     26 Nov 2002 00:44:38 -0000      1.3
  +++ XercesDocumentTypeWrapper.cpp     28 Nov 2002 00:26:07 -0000      1.4
  @@ -78,7 +78,7 @@
   
   
   XercesDocumentTypeWrapper::XercesDocumentTypeWrapper(
  -                     const DOMDocTypeType*                   
theXercesDOMDocumentType,
  +                     const DOMDocumentType_Type*             
theXercesDOMDocumentType,
                        const XercesWrapperNavigator&   theNavigator) :
        XalanDocumentType(),
        m_xercesNode(theXercesDOMDocumentType),
  
  
  
  1.4       +6 -6      
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp
  
  Index: XercesDocumentTypeWrapper.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XercesDocumentTypeWrapper.hpp     26 Nov 2002 00:44:38 -0000      1.3
  +++ XercesDocumentTypeWrapper.hpp     28 Nov 2002 00:26:07 -0000      1.4
  @@ -86,7 +86,7 @@
   public:
   
        XercesDocumentTypeWrapper(
  -                     const DOMDocTypeType*                   
theXercesDOMDocumentType,
  +                     const DOMDocumentType_Type*             
theXercesDOMDocumentType,
                        const XercesWrapperNavigator&   theNavigator);
   
        virtual
  @@ -491,7 +491,7 @@
         *
         * @return The Xerces node
         */
  -     const DOMDocTypeType*
  +     const DOMDocumentType_Type*
        getXercesNode() const
        {
                return m_xercesNode;
  @@ -511,13 +511,13 @@
        operator==(const XercesDocumentTypeWrapper&             theRHS) const;
   
        // Data members...
  -     const DOMDocTypeType* const             m_xercesNode;
  +     const DOMDocumentType_Type* const       m_xercesNode;
   
  -     XercesNamedNodeMapWrapper               m_entities;
  +     XercesNamedNodeMapWrapper                       m_entities;
        
  -     XercesNamedNodeMapWrapper               m_notations;
  +     XercesNamedNodeMapWrapper                       m_notations;
   
  -     const XercesWrapperNavigator&   m_navigator;
  +     const XercesWrapperNavigator&           m_navigator;
   };
   
   
  
  
  
  1.6       +12 -12    
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp
  
  Index: XercesDocumentWrapper.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XercesDocumentWrapper.cpp 26 Nov 2002 00:44:38 -0000      1.5
  +++ XercesDocumentWrapper.cpp 28 Nov 2002 00:26:07 -0000      1.6
  @@ -114,9 +114,9 @@
   
   
   XercesDocumentWrapper::XercesDocumentWrapper(
  -                     const DOMDocumentType*  theXercesDocument,
  -                     bool                                    threadSafe,
  -                     bool                                    buildWrapper) :
  +                     const DOMDocument_Type*         theXercesDocument,
  +                     bool                                            
threadSafe,
  +                     bool                                            
buildWrapper) :
        XalanDocument(),
        m_xercesDocument(theXercesDocument),
        m_documentElement(0),
  @@ -330,9 +330,9 @@
   
   XercesDocumentTypeWrapper*
   XercesDocumentWrapper::createWrapperNode(
  -                     const DOMDocTypeType*   theDoctype,
  -                     unsigned long                   theIndex,
  -                     bool                                    mapNode) const
  +                     const DOMDocumentType_Type*             theDoctype,
  +                     unsigned long                                   
theIndex,
  +                     bool                                                    
mapNode) const
   {
        // This is a special case, since there is only one
        // doctype node allowed...
  @@ -826,11 +826,11 @@
   
        case DOMNodeType::DOCUMENT_TYPE_NODE:
                {
  -                     const DOMDocTypeType*   theDoctypeNode =
  +                     const DOMDocumentType_Type*             theDoctypeNode =
   #if defined(XALAN_OLD_STYLE_CASTS)
  -                                             (const 
DOMDocTypeType*)theXercesNode;
  +                                             (const 
DOMDocumentType_Type*)theXercesNode;
   #else
  -                                             static_cast<const 
DOMDocTypeType*>(theXercesNode);
  +                                             static_cast<const 
DOMDocumentType_Type*>(theXercesNode);
   #endif
   
                        theNewNode = createWrapperNode(theDoctypeNode, 
theIndex, mapNode);
  @@ -1447,11 +1447,11 @@
        if (theType == DOMNodeType::DOCUMENT_TYPE_NODE)
        {
                // Special case for doctype -- we have to build its entities...
  -             const DOMDocTypeType* const     theDoctype =
  +             const DOMDocumentType_Type* const       theDoctype =
   #if defined(XALAN_OLD_STYLE_CASTS)
  -                     (const DOMDocTypeType*)node;
  +                     (const DOMDocumentType_Type*)node;
   #else
  -                     static_cast<const DOMDocTypeType*>(node);
  +                     static_cast<const DOMDocumentType_Type*>(node);
   #endif
   
                const DOMNamedNodeMapType* const        theEntities =
  
  
  
  1.4       +8 -8      
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp
  
  Index: XercesDocumentWrapper.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XercesDocumentWrapper.hpp 26 Nov 2002 00:44:38 -0000      1.3
  +++ XercesDocumentWrapper.hpp 28 Nov 2002 00:26:07 -0000      1.4
  @@ -138,9 +138,9 @@
         *
         */
        XercesDocumentWrapper(
  -                     const DOMDocumentType*  theXercesDocument,
  -                     bool                                    threadSafe = 
true,
  -                     bool                                    buildWrapper = 
true);
  +                     const DOMDocument_Type*         theXercesDocument,
  +                     bool                                            
threadSafe = true,
  +                     bool                                            
buildWrapper = true);
   
        virtual
        ~XercesDocumentWrapper();
  @@ -340,7 +340,7 @@
         * @return the Xerces DOMDocument instance.
         *
         */
  -     const DOMDocumentType*
  +     const DOMDocument_Type*
        getXercesDocument() const
        {
                return m_xercesDocument;
  @@ -476,9 +476,9 @@
   
        XercesDocumentTypeWrapper*
        createWrapperNode(
  -                     const DOMDocTypeType*   theDoctype,
  -                     unsigned long                   theIndex,
  -                     bool                                    mapNode) const;
  +                     const DOMDocumentType_Type*             theDoctype,
  +                     unsigned long                                   
theIndex,
  +                     bool                                                    
mapNode) const;
   
        XercesElementWrapper*
        createWrapperNode(
  @@ -540,7 +540,7 @@
        // This is a private helper class for building the tree...
        friend class BuildWrapperTreeWalker;
   
  -     const DOMDocumentType* const                    m_xercesDocument;
  +     const DOMDocument_Type* const                   m_xercesDocument;
   
        XalanElement*                                                   
m_documentElement;
   
  
  
  
  1.57      +16 -16    
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
  
  Index: XercesParserLiaison.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- XercesParserLiaison.cpp   22 Nov 2002 01:12:49 -0000      1.56
  +++ XercesParserLiaison.cpp   28 Nov 2002 00:26:07 -0000      1.57
  @@ -238,12 +238,12 @@
        theParser->parse(reader);
   
   #if XERCES_VERSION_MAJOR >= 2
  -     DOMDocumentType* const  theXercesDocument =
  +     DOMDocument_Type* const theXercesDocument =
                theParser->getDocument();
   
        theXercesDocument->normalize();
   #else
  -     DOM_DocumentType        theXercesDocument =
  +     DOM_Document_Type       theXercesDocument =
                theParser->getDocument();
   
        theXercesDocument.normalize();
  @@ -274,8 +274,8 @@
   XalanDocument*
   XercesParserLiaison::createDocument()
   {
  -     const DOM_DocumentType  theXercesDocument =
  -             DOM_DocumentType::createDocument();
  +     const DOM_Document_Type theXercesDocument =
  +             DOM_Document_Type::createDocument();
   
        return createDocument(theXercesDocument, false, false);
   }
  @@ -471,7 +471,7 @@
   
   XalanDocument*
   XercesParserLiaison::createDocument(
  -                     const DOM_DocumentType&         theXercesDocument,
  +                     const DOM_Document_Type&        theXercesDocument,
                        bool                                            
threadSafe,
                        bool                                            
buildBridge)
   {
  @@ -482,9 +482,9 @@
   
   XalanDocument*
   XercesParserLiaison::createDocument(
  -                     const DOMDocumentType*  theXercesDocument,
  -                     bool                                    threadSafe,
  -                     bool                                    buildWrapper)
  +                     const DOMDocument_Type*         theXercesDocument,
  +                     bool                                            
threadSafe,
  +                     bool                                            
buildWrapper)
   {
        // As we did not create the underlying DOMDocument - ensure we don't
        // delete it later.
  @@ -515,18 +515,18 @@
   
   
   
  -DOM_DocumentType
  +DOM_Document_Type
   XercesParserLiaison::mapXercesDocument(const XalanDocument*  theDocument) 
const
   {
        const DocumentMapType::const_iterator   i =
                m_documentMap.find(theDocument);
   
  -     return i != m_documentMap.end() ? (*i).second.m_isDeprecated == true ? 
(*i).second.m_bridge->getXercesDocument() : DOM_DocumentType() : 
DOM_DocumentType();
  +     return i != m_documentMap.end() ? (*i).second.m_isDeprecated == true ? 
(*i).second.m_bridge->getXercesDocument() : DOM_Document_Type() : 
DOM_Document_Type();
   }
   
   
   
  -const DOMDocumentType*
  +const DOMDocument_Type*
   XercesParserLiaison::mapToXercesDocument(const XalanDocument*        
theDocument) const
   {
        const DocumentMapType::const_iterator   i =
  @@ -717,7 +717,7 @@
   
   XercesDocumentBridge*
   XercesParserLiaison::doCreateDocument(
  -                     const DOM_DocumentType&         theXercesDocument,
  +                     const DOM_Document_Type&        theXercesDocument,
                        bool                                            
threadSafe,
                        bool                                            
buildBridge)
   {
  @@ -733,10 +733,10 @@
   
   XercesDocumentWrapper*
   XercesParserLiaison::doCreateDocument(
  -                     const DOMDocumentType*  theXercesDocument,
  -                     bool                                    threadSafe,
  -                     bool                                    buildWrapper,
  -                     bool                                    isOwned)
  +                     const DOMDocument_Type*         theXercesDocument,
  +                     bool                                            
threadSafe,
  +                     bool                                            
buildWrapper,
  +                     bool                                            isOwned)
   {
        XercesDocumentWrapper* const            theNewDocument =
                new XercesDocumentWrapper(theXercesDocument, threadSafe, 
buildWrapper);
  
  
  
  1.42      +13 -13    
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp
  
  Index: XercesParserLiaison.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- XercesParserLiaison.hpp   22 Nov 2002 02:32:43 -0000      1.41
  +++ XercesParserLiaison.hpp   28 Nov 2002 00:26:07 -0000      1.42
  @@ -351,7 +351,7 @@
         * @return a pointer to a new XalanDocument-derived instance.
         */
        XalanDocument*
  -     createDocument(const DOM_DocumentType&  theXercesDocument)
  +     createDocument(const DOM_Document_Type&         theXercesDocument)
        {
                return createDocument(theXercesDocument, m_threadSafe, 
m_buildBridge);
        }
  @@ -372,7 +372,7 @@
         */
        XalanDocument*
        createDocument(
  -                     const DOM_DocumentType&         theXercesDocument,
  +                     const DOM_Document_Type&        theXercesDocument,
                        bool                                            
threadSafe,
                        bool                                            
buildBridge);
   
  @@ -386,7 +386,7 @@
         * @return a pointer to a new XalanDocument-derived instance.
         */
        XalanDocument*
  -     createDocument(const DOMDocumentType*   theXercesDocument)
  +     createDocument(const DOMDocument_Type*  theXercesDocument)
        {
                return createDocument(theXercesDocument, m_threadSafe, 
m_buildWrapper);
        }
  @@ -404,9 +404,9 @@
         */
        XalanDocument*
        createDocument(
  -                     const DOMDocumentType*  theXercesDocument,
  -                     bool                                    threadSafe,
  -                     bool                                    buildWrapper);
  +                     const DOMDocument_Type*         theXercesDocument,
  +                     bool                                            
threadSafe,
  +                     bool                                            
buildWrapper);
   
        /**
         * This API is deprecated.
  @@ -447,7 +447,7 @@
         * @param theDocument A pointer to a XalanDocument instance.
         * @return A pointer to the XercesDocumentBridge instance.
         */
  -     DOM_DocumentType
  +     DOM_Document_Type
        mapXercesDocument(const XalanDocument*  theDocument) const;
   
        /** 
  @@ -459,7 +459,7 @@
         * @param theDocument A pointer to a XalanDocument instance.
         * @return A pointer to the XercesDocumentBridge instance.
         */
  -     const DOMDocumentType*
  +     const DOMDocument_Type*
        mapToXercesDocument(const XalanDocument*        theDocument) const;
   
        // Implementations for SAX ErrorHandler
  @@ -657,7 +657,7 @@
         */
        XercesDocumentBridge*
        doCreateDocument(
  -                     const DOM_DocumentType&         theXercesDocument,
  +                     const DOM_Document_Type&        theXercesDocument,
                        bool                                            
threadSafe,
                        bool                                            
buildBridge);
   
  @@ -671,10 +671,10 @@
         */
        XercesDocumentWrapper*
        doCreateDocument(
  -                     const DOMDocumentType*  theXercesDocument,
  -                     bool                                    threadSafe,
  -                     bool                                    buildWrapper,
  -                     bool                                    isOwned);
  +                     const DOMDocument_Type*         theXercesDocument,
  +                     bool                                            
threadSafe,
  +                     bool                                            
buildWrapper,
  +                     bool                                            
isOwned);
   
   private:
   
  
  
  
  1.3       +3 -2      
xml-xalan/c/src/XercesParserLiaison/XercesWrapperTypes.hpp
  
  Index: XercesWrapperTypes.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperTypes.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XercesWrapperTypes.hpp    26 Nov 2002 00:44:38 -0000      1.2
  +++ XercesWrapperTypes.hpp    28 Nov 2002 00:26:07 -0000      1.3
  @@ -93,8 +93,9 @@
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCharacterData      
DOMCharacterDataType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMComment                    
DOMCommentType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCDATASection               
DOMCDATASectionType;
  -typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType               
DOMDocTypeType;
  -typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument                   
DOMDocumentType;
  +// These next two have an extra '_' because they collide without it...
  +typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType               
DOMDocumentType_Type;
  +typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument                   
DOMDocument_Type;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentFragment   
DOMDocumentFragmentType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementation     
DOMImplementationType;
   typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMElement                    
DOMElementType;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to