You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2003/09/11 13:29:12 UTC
cvs commit: xml-security/c/src/utils/unixutils XSECBinHTTPURIInputStream.cpp XSECBinHTTPURIInputStream.hpp XSECURIResolverGenericUnix.cpp XSECURIResolverGenericUnix.hpp
blautenb 2003/09/11 04:29:12
Modified: c/src/utils/unixutils XSECBinHTTPURIInputStream.cpp
XSECBinHTTPURIInputStream.hpp
XSECURIResolverGenericUnix.cpp
XSECURIResolverGenericUnix.hpp
Log:
Fix Xerces namespace usage in *NIX build
Revision Changes Path
1.6 +5 -6 xml-security/c/src/utils/unixutils/XSECBinHTTPURIInputStream.cpp
Index: XSECBinHTTPURIInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/unixutils/XSECBinHTTPURIInputStream.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECBinHTTPURIInputStream.cpp 5 Jul 2003 10:30:37 -0000 1.5
+++ XSECBinHTTPURIInputStream.cpp 11 Sep 2003 11:29:12 -0000 1.6
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.6 2003/09/11 11:29:12 blautenb
+ * Fix Xerces namespace usage in *NIX build
+ *
* Revision 1.5 2003/07/05 10:30:37 blautenb
* Copyright update
*
@@ -110,11 +113,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
-XSEC_USING_XERCES(XMLUri);
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(ArrayJanitor);
-XSEC_USING_XERCES(XMLExcepts);
-XSEC_USING_XERCES(NetAccessorException);
+XERCES_CPP_NAMESPACE_USE
int XSECBinHTTPURIInputStream::getSocketHandle(const XMLUri& urlSource) {
1.3 +7 -8 xml-security/c/src/utils/unixutils/XSECBinHTTPURIInputStream.hpp
Index: XSECBinHTTPURIInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/unixutils/XSECBinHTTPURIInputStream.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECBinHTTPURIInputStream.hpp 5 Jul 2003 10:30:38 -0000 1.2
+++ XSECBinHTTPURIInputStream.hpp 11 Sep 2003 11:29:12 -0000 1.3
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.3 2003/09/11 11:29:12 blautenb
+ * Fix Xerces namespace usage in *NIX build
+ *
* Revision 1.2 2003/07/05 10:30:38 blautenb
* Copyright update
*
@@ -89,19 +92,15 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/BinInputStream.hpp>
-XSEC_USING_XERCES(XMLUri);
-XSEC_USING_XERCES(BinInputStream);
-
-
//
// This class implements the BinInputStream interface specified by the XML
// parser.
//
-class DSIG_EXPORT XSECBinHTTPURIInputStream : public BinInputStream
+class DSIG_EXPORT XSECBinHTTPURIInputStream : public XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream
{
public :
- XSECBinHTTPURIInputStream(const XMLUri& urlSource);
+ XSECBinHTTPURIInputStream(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri& urlSource);
~XSECBinHTTPURIInputStream();
unsigned int curPos() const;
@@ -130,7 +129,7 @@
// that readBytes must return.
// -----------------------------------------------------------------------
- int getSocketHandle(const XMLUri& urlSource);
+ int getSocketHandle(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri& urlSource);
int fSocket;
unsigned int fBytesProcessed;
1.5 +5 -3 xml-security/c/src/utils/unixutils/XSECURIResolverGenericUnix.cpp
Index: XSECURIResolverGenericUnix.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/unixutils/XSECURIResolverGenericUnix.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECURIResolverGenericUnix.cpp 5 Jul 2003 10:30:38 -0000 1.4
+++ XSECURIResolverGenericUnix.cpp 11 Sep 2003 11:29:12 -0000 1.5
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.5 2003/09/11 11:29:12 blautenb
+ * Fix Xerces namespace usage in *NIX build
+ *
* Revision 1.4 2003/07/05 10:30:38 blautenb
* Copyright update
*
@@ -95,8 +98,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/BinFileInputStream.hpp>
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp>
1.3 +6 -5 xml-security/c/src/utils/unixutils/XSECURIResolverGenericUnix.hpp
Index: XSECURIResolverGenericUnix.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/unixutils/XSECURIResolverGenericUnix.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECURIResolverGenericUnix.hpp 5 Jul 2003 10:30:38 -0000 1.2
+++ XSECURIResolverGenericUnix.hpp 11 Sep 2003 11:29:12 -0000 1.3
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.3 2003/09/11 11:29:12 blautenb
+ * Fix Xerces namespace usage in *NIX build
+ *
* Revision 1.2 2003/07/05 10:30:38 blautenb
* Copyright update
*
@@ -88,9 +91,6 @@
#include <xercesc/util/XMLString.hpp>
-XSEC_USING_XERCES(XMLString);
-
-
/**
* @ingroup pubsig
*/
@@ -139,7 +139,8 @@
* @returns The octet stream corresponding to the URI.
*/
- virtual BinInputStream * resolveURI(const XMLCh * uri);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream *
+ resolveURI(const XMLCh * uri);
/**
* \brief Clone the resolver to be installed in a new object.