[SCM] Debian packaging for XMLTooling-C branch, master, updated. upstream/1.1-71-g23b0b2f

Ferenc Wagner wferi at niif.hu
Wed Sep 10 18:46:51 UTC 2008


The following commit has been merged in the master branch:
commit 23b0b2ffaf646b40b1d9305937f921a5eb178cb1
Author: Ferenc Wagner <wferi at niif.hu>
Date:   Wed Sep 10 19:29:37 2008 +0200

    Revert "Add <memory> includes for auto_ptr"
    
    This reverts commit 57d3720c2af36f7e23a688395f3b57d081ac28dd.
    Upstream version 1.1 already compiles fine with gcc-4.3.
    The conflicting files were simply copied from the upstream branch.
    Conflicts:
    
    	xmltooling/XMLObjectBuilder.h
    	xmltooling/exceptions.cpp
    	xmltooling/impl/MemoryStorageService.cpp

diff --git a/xmltooling/AbstractDOMCachingXMLObject.cpp b/xmltooling/AbstractDOMCachingXMLObject.cpp
index 38bfa15..9417e31 100644
--- a/xmltooling/AbstractDOMCachingXMLObject.cpp
+++ b/xmltooling/AbstractDOMCachingXMLObject.cpp
@@ -28,7 +28,6 @@
 
 #include <algorithm>
 #include <functional>
-#include <memory>
 
 using namespace xmltooling;
 using namespace std;
diff --git a/xmltooling/encryption/impl/Decrypter.cpp b/xmltooling/encryption/impl/Decrypter.cpp
index 4639b1b..a87fa89 100644
--- a/xmltooling/encryption/impl/Decrypter.cpp
+++ b/xmltooling/encryption/impl/Decrypter.cpp
@@ -28,7 +28,6 @@
 #include "security/CredentialCriteria.h"
 #include "security/CredentialResolver.h"
 
-#include <memory>
 #include <xsec/enc/XSECCryptoException.hpp>
 #include <xsec/framework/XSECException.hpp>
 #include <xsec/framework/XSECAlgorithmMapper.hpp>
diff --git a/xmltooling/encryption/impl/Encrypter.cpp b/xmltooling/encryption/impl/Encrypter.cpp
index 8b66c97..ae184e9 100644
--- a/xmltooling/encryption/impl/Encrypter.cpp
+++ b/xmltooling/encryption/impl/Encrypter.cpp
@@ -24,7 +24,6 @@
 #include "encryption/Encrypter.h"
 #include "security/Credential.h"
 
-#include <memory>
 #include <xsec/enc/XSECCryptoException.hpp>
 #include <xsec/framework/XSECException.hpp>
 #include <xsec/framework/XSECAlgorithmMapper.hpp>
diff --git a/xmltooling/impl/AnyElement.cpp b/xmltooling/impl/AnyElement.cpp
index 053e67b..1e4e2f0 100644
--- a/xmltooling/impl/AnyElement.cpp
+++ b/xmltooling/impl/AnyElement.cpp
@@ -26,7 +26,6 @@
 #include "util/NDC.h"
 #include "util/XMLHelper.h"
 
-#include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xmltooling;
diff --git a/xmltooling/io/AbstractXMLObjectUnmarshaller.cpp b/xmltooling/io/AbstractXMLObjectUnmarshaller.cpp
index 9de24ab..5a07591 100644
--- a/xmltooling/io/AbstractXMLObjectUnmarshaller.cpp
+++ b/xmltooling/io/AbstractXMLObjectUnmarshaller.cpp
@@ -28,7 +28,6 @@
 #include "util/XMLConstants.h"
 #include "util/XMLHelper.h"
 
-#include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xmlconstants;
diff --git a/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp b/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
index 2637cbb..69e24f3 100644
--- a/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
+++ b/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
@@ -26,7 +26,6 @@
 #include "security/AbstractPKIXTrustEngine.h"
 #include "signature/KeyInfo.h"
 
-#include <memory>
 #include <openssl/x509_vfy.h>
 #include <openssl/x509v3.h>
 #include <xmltooling/security/CredentialCriteria.h>
diff --git a/xmltooling/security/impl/InlineKeyResolver.cpp b/xmltooling/security/impl/InlineKeyResolver.cpp
index bcc49ef..6b71a9a 100644
--- a/xmltooling/security/impl/InlineKeyResolver.cpp
+++ b/xmltooling/security/impl/InlineKeyResolver.cpp
@@ -32,7 +32,6 @@
 #include "util/XMLConstants.h"
 #include "validation/ValidatorSuite.h"
 
-#include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xsec/dsig/DSIGKeyInfoX509.hpp>
 #include <xsec/enc/XSECKeyInfoResolverDefault.hpp>
diff --git a/xmltooling/soap/impl/SOAPClient.cpp b/xmltooling/soap/impl/SOAPClient.cpp
index f7ae96b..e89742b 100644
--- a/xmltooling/soap/impl/SOAPClient.cpp
+++ b/xmltooling/soap/impl/SOAPClient.cpp
@@ -28,7 +28,6 @@
 #include "util/XMLHelper.h"
 #include "validation/ValidatorSuite.h"
 
-#include <memory>
 #include <sstream>
 
 using namespace soap11;

-- 
Debian packaging for XMLTooling-C



More information about the Pkg-shibboleth-devel mailing list