blautenb 2003/09/11 04:07:08
Modified: c/src/xenc XENCCipher.hpp XENCEncryptedType.hpp
c/src/xenc/impl XENCCipherDataImpl.cpp
XENCCipherDataImpl.hpp XENCCipherImpl.cpp
XENCCipherImpl.hpp XENCCipherValueImpl.cpp
XENCCipherValueImpl.hpp XENCEncryptedDataImpl.cpp
XENCEncryptedDataImpl.hpp XENCEncryptedTypeImpl.cpp
XENCEncryptedTypeImpl.hpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace
in headers
Revision Changes Path
1.3 +8 -4 xml-security/c/src/xenc/XENCCipher.hpp
Index: XENCCipher.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/XENCCipher.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipher.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipher.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -142,7 +142,9 @@
* not a valid EncryptedData DOM structure.
*/
- virtual DOMDocument * decryptElement(DOMElement * element) = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * decryptElement(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * element
+ ) = 0;
//@}
@@ -161,7 +163,9 @@
* @throws XSECException if the encryption fails.
*/
- virtual DOMDocument * encryptElement(DOMElement * element) = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * encryptElement(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * element
+ ) = 0;
//@}
/** @name Getter Functions */
@@ -176,7 +180,7 @@
* @returns The DOMDocument that is used by this object
*/
- virtual DOMDocument * getDocument(void) = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * getDocument(void)
= 0;
/**
* \brief Get namespace prefix for XENC nodes
1.3 +2 -2 xml-security/c/src/xenc/XENCEncryptedType.hpp
Index: XENCEncryptedType.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/XENCEncryptedType.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCEncryptedType.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCEncryptedType.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -135,7 +135,7 @@
* @returns the DOMNode that heads up this structure
*/
- virtual DOMElement * getDOMNode() = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * getDOMNode() = 0;
//@}
1.3 +42 -40 xml-security/c/src/xenc/impl/XENCCipherDataImpl.cpp
Index: XENCCipherDataImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherDataImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipherDataImpl.cpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipherDataImpl.cpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -76,59 +76,61 @@
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_USE
+
//
--------------------------------------------------------------------------------
// String Constants
//
--------------------------------------------------------------------------------
static XMLCh s_CipherData[] = {
- XERCES_CPP_NAMESPACE :: chLatin_C,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_h,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_D,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_C,
+ chLatin_i,
+ chLatin_p,
+ chLatin_h,
+ chLatin_e,
+ chLatin_r,
+ chLatin_D,
+ chLatin_a,
+ chLatin_t,
+ chLatin_a,
+ chNull,
};
static XMLCh s_CipherValue[] = {
- XERCES_CPP_NAMESPACE :: chLatin_C,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_h,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_V,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chLatin_l,
- XERCES_CPP_NAMESPACE :: chLatin_u,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_C,
+ chLatin_i,
+ chLatin_p,
+ chLatin_h,
+ chLatin_e,
+ chLatin_r,
+ chLatin_V,
+ chLatin_a,
+ chLatin_l,
+ chLatin_u,
+ chLatin_e,
+ chNull,
};
static XMLCh s_CipherReference[] = {
- XERCES_CPP_NAMESPACE :: chLatin_C,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_h,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_R,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_f,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_c,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_C,
+ chLatin_i,
+ chLatin_p,
+ chLatin_h,
+ chLatin_e,
+ chLatin_r,
+ chLatin_R,
+ chLatin_e,
+ chLatin_f,
+ chLatin_e,
+ chLatin_r,
+ chLatin_e,
+ chLatin_n,
+ chLatin_c,
+ chLatin_e,
+ chNull,
};
//
--------------------------------------------------------------------------------
1.3 +9 -4 xml-security/c/src/xenc/impl/XENCCipherDataImpl.hpp
Index: XENCCipherDataImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherDataImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipherDataImpl.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipherDataImpl.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -85,14 +85,18 @@
public:
XENCCipherDataImpl(XENCCipherImpl * cipher);
- XENCCipherDataImpl(XENCCipherImpl * cipher, DOMNode * node);
+ XENCCipherDataImpl(
+ XENCCipherImpl * cipher,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node
+ );
virtual ~XENCCipherDataImpl();
// Load elements
void load();
// Create
- DOMElement * createBlankCipherData(XENCCipherData::XENCCipherDataType
type, const XMLCh * value);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankCipherData(XENCCipherData::XENCCipherDataType type,
const XMLCh * value);
// Interface methods
@@ -106,7 +110,8 @@
XENCCipherDataImpl();
XENCCipherImpl * mp_cipher;
- DOMNode * mp_cipherDataNode;
// Node at head of structure
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_cipherDataNode;
// Node at head of structure
XENCCipherDataType m_cipherDataType;
// Is this a value or a reference?
XENCCipherValueImpl * mp_cipherValue;
// Cipher value node
1.3 +15 -15 xml-security/c/src/xenc/impl/XENCCipherImpl.cpp
Index: XENCCipherImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipherImpl.cpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipherImpl.cpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -103,24 +103,24 @@
const XMLCh s_tagname[] = {
- XERCES_CPP_NAMESPACE :: chLatin_f,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chLatin_g,
- XERCES_CPP_NAMESPACE :: chLatin_m,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chNull
+ chLatin_f,
+ chLatin_r,
+ chLatin_a,
+ chLatin_g,
+ chLatin_m,
+ chLatin_e,
+ chLatin_n,
+ chLatin_t,
+ chNull
};
const XMLCh s_defaultXENCPrefix[] = {
- XERCES_CPP_NAMESPACE :: chLatin_x,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_c,
- XERCES_CPP_NAMESPACE :: chNull
+ chLatin_x,
+ chLatin_e,
+ chLatin_n,
+ chLatin_c,
+ chNull
};
1.3 +15 -7 xml-security/c/src/xenc/impl/XENCCipherImpl.hpp
Index: XENCCipherImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipherImpl.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipherImpl.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -90,13 +90,16 @@
// Implementation for decrypting elements
- DOMDocument * decryptElement(DOMElement * element);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *
+ decryptElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
element);
// Implementation for encryption Elements
- DOMDocument * encryptElement(DOMElement * element);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * encryptElement(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * element);
// Getter methods
- DOMDocument * getDocument(void) {return mp_doc;}
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * getDocument(void)
+ {return mp_doc;}
const XMLCh * getXENCNSPrefix(void) const;
// Setter methods
@@ -111,19 +114,24 @@
protected:
// Protected to prevent direct creation of objects
- XENCCipherImpl(DOMDocument * doc);
+ XENCCipherImpl(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc);
// Creates a transform chain that gives the decrypted data
TXFMChain * createDecryptionTXFMChain(void);
private:
// Internal functions
- DOMDocumentFragment * deSerialise(safeBuffer &content, DOMNode * ctx);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentFragment
+ * deSerialise(
+ safeBuffer
&content,
+
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * ctx
+ );
// Unimplemented constructor
XENCCipherImpl();
- DOMDocument * mp_doc;
// Document against which this will operate
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * mp_doc;
// Document against which this will operate
// Current working object
XENCEncryptedDataImpl * mp_encryptedData;
1.3 +15 -13 xml-security/c/src/xenc/impl/XENCCipherValueImpl.cpp
Index: XENCCipherValueImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherValueImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipherValueImpl.cpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipherValueImpl.cpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -77,24 +77,26 @@
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_USE
+
//
--------------------------------------------------------------------------------
// String Constants
//
--------------------------------------------------------------------------------
static XMLCh s_CipherValue[] = {
- XERCES_CPP_NAMESPACE :: chLatin_C,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_h,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_V,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chLatin_l,
- XERCES_CPP_NAMESPACE :: chLatin_u,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_C,
+ chLatin_i,
+ chLatin_p,
+ chLatin_h,
+ chLatin_e,
+ chLatin_r,
+ chLatin_V,
+ chLatin_a,
+ chLatin_l,
+ chLatin_u,
+ chLatin_e,
+ chNull,
};
//
--------------------------------------------------------------------------------
1.3 +9 -4 xml-security/c/src/xenc/impl/XENCCipherValueImpl.hpp
Index: XENCCipherValueImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherValueImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCCipherValueImpl.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCCipherValueImpl.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -84,14 +84,18 @@
public:
XENCCipherValueImpl(XENCCipherImpl * cipher);
- XENCCipherValueImpl(XENCCipherImpl * cipher, DOMNode * node);
+ XENCCipherValueImpl(
+ XENCCipherImpl * cipher,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node
+ );
virtual ~XENCCipherValueImpl();
// Load
void load(void);
// Create
- DOMElement * createBlankCipherValue(const XMLCh * value);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankCipherValue(const XMLCh * value);
// Interface methods
@@ -104,7 +108,8 @@
XENCCipherValueImpl & operator = (const XENCCipherValueImpl &);
XENCCipher * mp_cipher;
- DOMNode * mp_cipherValueNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_cipherValueNode;
XMLCh * mp_cipherString;
// EncryptedData
};
1.3 +17 -15 xml-security/c/src/xenc/impl/XENCEncryptedDataImpl.cpp
Index: XENCEncryptedDataImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedDataImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCEncryptedDataImpl.cpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCEncryptedDataImpl.cpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -77,26 +77,28 @@
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_USE
+
//
--------------------------------------------------------------------------------
// UNICODE Strings
//
--------------------------------------------------------------------------------
static XMLCh s_EncryptedData[] = {
- XERCES_CPP_NAMESPACE :: chLatin_E,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_c,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_y,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_d,
- XERCES_CPP_NAMESPACE :: chLatin_D,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_E,
+ chLatin_n,
+ chLatin_c,
+ chLatin_r,
+ chLatin_y,
+ chLatin_p,
+ chLatin_t,
+ chLatin_e,
+ chLatin_d,
+ chLatin_D,
+ chLatin_a,
+ chLatin_t,
+ chLatin_a,
+ chNull,
};
//
--------------------------------------------------------------------------------
1.3 +8 -4 xml-security/c/src/xenc/impl/XENCEncryptedDataImpl.hpp
Index: XENCEncryptedDataImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedDataImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCEncryptedDataImpl.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCEncryptedDataImpl.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -84,21 +84,25 @@
public:
XENCEncryptedDataImpl(XENCCipherImpl * cipher);
- XENCEncryptedDataImpl(XENCCipherImpl * cipher, DOMNode * node);
+ XENCEncryptedDataImpl(
+ XENCCipherImpl * cipher,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node
+ );
virtual ~XENCEncryptedDataImpl();
void load(void);
// Create a blank EncryptedData DOM structure
- DOMElement *
createBlankEncryptedData(XENCCipherData::XENCCipherDataType type, const XMLCh *
value);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankEncryptedData(XENCCipherData::XENCCipherDataType
type, const XMLCh * value);
// Interface methods
// Inherited from XENCEncryptedData - need to re-implement
virtual XENCCipherData * getCipherData(void)
{return XENCEncryptedTypeImpl::getCipherData();}
- virtual DOMElement * getDOMNode()
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * getDOMNode()
{return XENCEncryptedTypeImpl::getDOMNode();}
1.3 +38 -40 xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.cpp
Index: XENCEncryptedTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCEncryptedTypeImpl.cpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCEncryptedTypeImpl.cpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -82,9 +82,7 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(Janitor);
-XSEC_USING_XERCES(ArrayJanitor);
-
+XERCES_CPP_NAMESPACE_USE
//
--------------------------------------------------------------------------------
// UNICODE Strings
@@ -92,50 +90,50 @@
static XMLCh s_EncryptionMethod[] = {
- XERCES_CPP_NAMESPACE :: chLatin_E,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_c,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_y,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_o,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_M,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_h,
- XERCES_CPP_NAMESPACE :: chLatin_o,
- XERCES_CPP_NAMESPACE :: chLatin_d,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_E,
+ chLatin_n,
+ chLatin_c,
+ chLatin_r,
+ chLatin_y,
+ chLatin_p,
+ chLatin_t,
+ chLatin_i,
+ chLatin_o,
+ chLatin_n,
+ chLatin_M,
+ chLatin_e,
+ chLatin_t,
+ chLatin_h,
+ chLatin_o,
+ chLatin_d,
+ chNull,
};
static XMLCh s_KeyInfo[] = {
- XERCES_CPP_NAMESPACE :: chLatin_K,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_y,
- XERCES_CPP_NAMESPACE :: chLatin_I,
- XERCES_CPP_NAMESPACE :: chLatin_n,
- XERCES_CPP_NAMESPACE :: chLatin_f,
- XERCES_CPP_NAMESPACE :: chLatin_o,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_K,
+ chLatin_e,
+ chLatin_y,
+ chLatin_I,
+ chLatin_n,
+ chLatin_f,
+ chLatin_o,
+ chNull,
};
static XMLCh s_CipherData[] = {
- XERCES_CPP_NAMESPACE :: chLatin_C,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_p,
- XERCES_CPP_NAMESPACE :: chLatin_h,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chLatin_D,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_a,
- XERCES_CPP_NAMESPACE :: chNull,
+ chLatin_C,
+ chLatin_i,
+ chLatin_p,
+ chLatin_h,
+ chLatin_e,
+ chLatin_r,
+ chLatin_D,
+ chLatin_a,
+ chLatin_t,
+ chLatin_a,
+ chNull,
};
//
--------------------------------------------------------------------------------
1.3 +9 -5 xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.hpp
Index: XENCEncryptedTypeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XENCEncryptedTypeImpl.hpp 8 Sep 2003 12:07:49 -0000 1.2
+++ XENCEncryptedTypeImpl.hpp 11 Sep 2003 11:07:07 -0000 1.3
@@ -88,7 +88,10 @@
public:
XENCEncryptedTypeImpl(XENCCipherImpl * cipher);
- XENCEncryptedTypeImpl(XENCCipherImpl * cipher, DOMNode * node);
+ XENCEncryptedTypeImpl(
+ XENCCipherImpl * cipher,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node
+ );
virtual ~XENCEncryptedTypeImpl();
@@ -97,14 +100,14 @@
// Create from scratch. LocalName is the name of the owning element
- DOMElement * createBlankEncryptedType(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankEncryptedType(
XMLCh * localName,
XENCCipherData::XENCCipherDataType type,
const XMLCh * value);
// Interface Methods
virtual XENCCipherData * getCipherData(void);
- virtual DOMElement * getDOMNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * getDOMNode();
protected:
@@ -114,7 +117,8 @@
TXFMChain * createCipherTXFMChain(void);
XENCCipherImpl * mp_cipher;
- DOMNode * mp_encryptedTypeNode;
// Node at head of structure
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_encryptedTypeNode;
// Node at head of structure
XENCCipherDataImpl * mp_cipherData;
friend XENCCipherImpl;
