blautenb 2003/09/11 04:14:57
Modified: c/src/canon XSECC14n20010315.cpp XSECC14n20010315.hpp
XSECCannon.cpp XSECCanon.hpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace
in headers
Revision Changes Path
1.12 +2 -3 xml-security/c/src/canon/XSECC14n20010315.cpp
Index: XSECC14n20010315.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/canon/XSECC14n20010315.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSECC14n20010315.cpp 9 Aug 2003 10:10:11 -0000 1.11
+++ XSECC14n20010315.cpp 11 Sep 2003 11:14:57 -0000 1.12
@@ -78,8 +78,7 @@
// Xerces includes
#include <xercesc/dom/DOMNamedNodeMap.hpp>
-XSEC_USING_XERCES(DOMNamedNodeMap);
-XSEC_USING_XERCES(DOMProcessingInstruction);
+XERCES_CPP_NAMESPACE_USE
#ifndef XSEC_NO_XALAN
1.5 +13 -13 xml-security/c/src/canon/XSECC14n20010315.hpp
Index: XSECC14n20010315.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/canon/XSECC14n20010315.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECC14n20010315.hpp 9 Aug 2003 10:10:11 -0000 1.4
+++ XSECC14n20010315.hpp 11 Sep 2003 11:14:57 -0000 1.5
@@ -65,9 +65,7 @@
*
* Author(s): Berin Lautenbach
*
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -145,11 +143,11 @@
struct XSECNodeListElt {
- DOMNode *element; // Element referred to
- safeBuffer sortString; // The string that is
used to sort the nodes
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *element; // Element
referred to
+ safeBuffer sortString;
// The string that is used to sort the nodes
- XSECNodeListElt *next,
- *last; // For the list
+ XSECNodeListElt *next,
+ *last;
// For the list
};
@@ -184,8 +182,9 @@
// Constructors
XSECC14n20010315();
- XSECC14n20010315(DOMDocument *newDoc);
- XSECC14n20010315(DOMDocument *newDoc, DOMNode *newStartNode);
+ XSECC14n20010315(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *newDoc);
+ XSECC14n20010315(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *newDoc,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
*newStartNode);
virtual ~XSECC14n20010315();
// XPath processor
@@ -212,20 +211,21 @@
private:
void XSECC14n20010315::init();
- bool checkRenderNameSpaceNode(DOMNode *e, DOMNode *a);
+ bool checkRenderNameSpaceNode(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
*e,
+
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *a);
// For formatting the buffers
c14nFormatTarget *c14ntarget;
- XMLFormatter *formatter;
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter *formatter;
safeBuffer formatBuffer;
// For holding state whilst walking the DOM tree
XSECNodeListElt * mp_attributes, //
Start of list
* mp_currentAttribute,
// Where we currently are in list
* mp_firstNonNsAttribute;
// First NON XMLNS element in list
- DOMNode * mp_attributeParent; // To
return up the tree
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_attributeParent;
// To return up the tree
bool m_returnedFromChild;
// Did we get to this node from below?
- DOMNode * mp_firstElementNode; // The
root element of the document
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_firstElementNode;
// The root element of the document
bool m_firstElementProcessed; // Has
the first node been handled?
unsigned char * mp_charBuffer;
1.4 +2 -0 xml-security/c/src/canon/XSECCannon.cpp
Index: XSECCannon.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/canon/XSECCannon.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSECCannon.cpp 5 Jul 2003 10:30:30 -0000 1.3
+++ XSECCannon.cpp 11 Sep 2003 11:14:57 -0000 1.4
@@ -75,6 +75,8 @@
#include <memory.h>
+XERCES_CPP_NAMESPACE_USE
+
//
--------------------------------------------------------------------------------
// XSECCanon Virtual Class implementation
//
--------------------------------------------------------------------------------
1.4 +12 -10 xml-security/c/src/canon/XSECCanon.hpp
Index: XSECCanon.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/canon/XSECCanon.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSECCanon.hpp 5 Jul 2003 10:30:30 -0000 1.3
+++ XSECCanon.hpp 11 Sep 2003 11:14:57 -0000 1.4
@@ -98,13 +98,13 @@
// Data structures
- DOMDocument *mp_doc; //
Xerces DOM Node that defines the document
- DOMNode *mp_startNode, // Node to
start processing from
- *mp_nextNode; // Next
Node to be processeed
- safeBuffer m_buffer; //
Buffer holding parsed output
- int m_bufferLength, //
Length of input currently in buffer
- m_bufferPoint; // Next
"character" to copy out
- bool m_allNodesDone; // Have we
completed?
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * mp_doc;
// Xerces DOM Node that defines the document
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_startNode, // Node
to start processing from
+
*mp_nextNode; // Next Node to be processeed
+ safeBuffer
m_buffer; // Buffer holding parsed output
+ int
m_bufferLength, // Length of input currently in buffer
+
m_bufferPoint; // Next "character" to copy out
+ bool
m_allNodesDone; // Have we completed?
public:
@@ -112,8 +112,10 @@
// Constructors
XSECCanon();
- XSECCanon(DOMDocument *newDoc);
- XSECCanon(DOMDocument *newDoc, DOMNode *newStartNode);
+ XSECCanon(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *newDoc);
+ XSECCanon(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *newDoc,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *newStartNode);
// Destructors
@@ -129,7 +131,7 @@
// setStartNode sets the starting point for the output if it is a
sub-document
// that needs canonicalisation and we want to re-start
- bool setStartNode(DOMNode *newStartNode);
+ bool setStartNode(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *newStartNode);
protected:
