[cpp-sp] 08/47: Upstream fixed GCC 4.3 compilation errors in different ways

Scott Cantor cantor.2 at osu.edu
Thu Dec 20 19:41:36 EST 2018 

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.1.dfsg1-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=d56ea3502b0150e69ff219fab353547bf0debef7

commit d56ea3502b0150e69ff219fab353547bf0debef7
Author: Russ Allbery <rra at debian.org>
AuthorDate: Sat Aug 23 16:41:23 2008 -0700

    Upstream fixed GCC 4.3 compilation errors in different ways
    
    some files.  Adjust to match upstream's fix.
---
 adfs/adfs.cpp                                       | 1 -
 apache/mod_apache.cpp                               | 1 -
 shibsp/attribute/filtering/impl/AndMatchFunctor.cpp | 1 -
 shibsp/attribute/filtering/impl/NotMatchFunctor.cpp | 1 -
 shibsp/attribute/filtering/impl/OrMatchFunctor.cpp  | 1 -
 shibsp/handler/impl/AssertionConsumerService.cpp    | 1 -
 shibsp/handler/impl/AssertionLookup.cpp             | 1 -
 shibsp/handler/impl/MetadataGenerator.cpp           | 1 +
 shibsp/handler/impl/SAML2Logout.cpp                 | 1 -
 shibsp/handler/impl/SAML2NameIDMgmt.cpp             | 1 -
 shibsp/handler/impl/SAML2SessionInitiator.cpp       | 1 -
 shibsp/handler/impl/Shib1SessionInitiator.cpp       | 1 -
 shibsp/handler/impl/StatusHandler.cpp               | 1 -
 shibsp/impl/XMLRequestMapper.cpp                    | 1 -
 shibsp/impl/XMLServiceProvider.cpp                  | 1 -
 shibsp/remoting/impl/SocketListener.cpp             | 1 -
 16 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp
index 78b037b..0dd273b 100644
--- a/adfs/adfs.cpp
+++ b/adfs/adfs.cpp
@@ -50,7 +50,6 @@
 #include <xmltooling/util/URLEncoder.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>
-#include <memory>
 
 #ifndef SHIBSP_LITE
 # include <shibsp/attribute/resolver/ResolutionContext.h>
diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index fc712f1..4fd81e8 100644
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -46,7 +46,6 @@
 #include <xmltooling/util/Threads.h>
 #include <xmltooling/util/XMLConstants.h>
 #include <xmltooling/util/XMLHelper.h>
-#include <memory>
 
 #ifdef WIN32
 # include <winsock.h>
diff --git a/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp b/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp
index 787e34c..857050d 100644
--- a/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp
@@ -25,7 +25,6 @@
 #include "attribute/filtering/FilterPolicyContext.h"
 #include "util/SPConstants.h"
 
-#include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/util/XMLHelper.h>
 
diff --git a/shibsp/attribute/filtering/impl/NotMatchFunctor.cpp b/shibsp/attribute/filtering/impl/NotMatchFunctor.cpp
index dce6614..0f79a84 100644
--- a/shibsp/attribute/filtering/impl/NotMatchFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/NotMatchFunctor.cpp
@@ -25,7 +25,6 @@
 #include "attribute/filtering/FilterPolicyContext.h"
 #include "util/SPConstants.h"
 
-#include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/util/XMLHelper.h>
 
diff --git a/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp b/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
index b9e946f..cd29548 100644
--- a/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
@@ -25,7 +25,6 @@
 #include "attribute/filtering/FilterPolicyContext.h"
 #include "util/SPConstants.h"
 
-#include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/util/XMLHelper.h>
 
diff --git a/shibsp/handler/impl/AssertionConsumerService.cpp b/shibsp/handler/impl/AssertionConsumerService.cpp
index 9bb54e6..8f3b008 100644
--- a/shibsp/handler/impl/AssertionConsumerService.cpp
+++ b/shibsp/handler/impl/AssertionConsumerService.cpp
@@ -27,7 +27,6 @@
 #include "handler/AssertionConsumerService.h"
 #include "util/SPConstants.h"
 
-# include <memory>
 # include <ctime>
 #ifndef SHIBSP_LITE
 # include "attribute/Attribute.h"
diff --git a/shibsp/handler/impl/AssertionLookup.cpp b/shibsp/handler/impl/AssertionLookup.cpp
index ef13dd8..990d7d7 100644
--- a/shibsp/handler/impl/AssertionLookup.cpp
+++ b/shibsp/handler/impl/AssertionLookup.cpp
@@ -28,7 +28,6 @@
 #include "handler/AbstractHandler.h"
 #include "handler/RemotedHandler.h"
 #include "util/SPConstants.h"
-#include <memory>
 
 using namespace shibspconstants;
 using namespace shibsp;
diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index 695d2af..08e73e0 100644
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -30,6 +30,7 @@
 #ifndef SHIBSP_LITE
 # include "metadata/MetadataProviderCriteria.h"
 #endif
+
 #include <xercesc/framework/LocalFileInputSource.hpp>
 #include <xercesc/framework/Wrapper4InputSource.hpp>
 
diff --git a/shibsp/handler/impl/SAML2Logout.cpp b/shibsp/handler/impl/SAML2Logout.cpp
index 79cc3cc..d917407 100644
--- a/shibsp/handler/impl/SAML2Logout.cpp
+++ b/shibsp/handler/impl/SAML2Logout.cpp
@@ -27,7 +27,6 @@
 #include "handler/AbstractHandler.h"
 #include "handler/LogoutHandler.h"
 #include "util/SPConstants.h"
-#include <memory>
 
 #ifndef SHIBSP_LITE
 # include "SessionCacheEx.h"
diff --git a/shibsp/handler/impl/SAML2NameIDMgmt.cpp b/shibsp/handler/impl/SAML2NameIDMgmt.cpp
index 7b2803e..4aba9a6 100644
--- a/shibsp/handler/impl/SAML2NameIDMgmt.cpp
+++ b/shibsp/handler/impl/SAML2NameIDMgmt.cpp
@@ -27,7 +27,6 @@
 #include "handler/AbstractHandler.h"
 #include "handler/RemotedHandler.h"
 #include "util/SPConstants.h"
-#include <memory>
 
 #ifndef SHIBSP_LITE
 # include "SessionCache.h"
diff --git a/shibsp/handler/impl/SAML2SessionInitiator.cpp b/shibsp/handler/impl/SAML2SessionInitiator.cpp
index b9feec4..7121176 100644
--- a/shibsp/handler/impl/SAML2SessionInitiator.cpp
+++ b/shibsp/handler/impl/SAML2SessionInitiator.cpp
@@ -29,7 +29,6 @@
 #include "handler/RemotedHandler.h"
 #include "handler/SessionInitiator.h"
 #include "util/SPConstants.h"
-#include <memory>
 
 #ifndef SHIBSP_LITE
 # include "metadata/MetadataProviderCriteria.h"
diff --git a/shibsp/handler/impl/Shib1SessionInitiator.cpp b/shibsp/handler/impl/Shib1SessionInitiator.cpp
index 91fab74..aeda3c7 100644
--- a/shibsp/handler/impl/Shib1SessionInitiator.cpp
+++ b/shibsp/handler/impl/Shib1SessionInitiator.cpp
@@ -29,7 +29,6 @@
 #include "handler/RemotedHandler.h"
 #include "handler/SessionInitiator.h"
 #include "util/SPConstants.h"
-#include <memory>
 
 #ifndef SHIBSP_LITE
 # include "metadata/MetadataProviderCriteria.h"
diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index 689ebd6..41e9f1f 100644
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -27,7 +27,6 @@
 #include "handler/AbstractHandler.h"
 #include "handler/RemotedHandler.h"
 #include "util/CGIParser.h"
-#include <memory>
 
 using namespace shibsp;
 #ifndef SHIBSP_LITE
diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp
index 07c4db2..9c5f294 100644
--- a/shibsp/impl/XMLRequestMapper.cpp
+++ b/shibsp/impl/XMLRequestMapper.cpp
@@ -27,7 +27,6 @@
 #include "util/DOMPropertySet.h"
 #include "util/SPConstants.h"
 
-#include <memory>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/ReloadableXMLFile.h>
 #include <xmltooling/util/XMLHelper.h>
diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index 80e60ff..fb16a21 100644
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -32,7 +32,6 @@
 #include "remoting/ListenerService.h"
 #include "util/DOMPropertySet.h"
 #include "util/SPConstants.h"
-#include <memory>
 
 #if defined(XMLTOOLING_LOG4SHIB)
 # include <log4shib/PropertyConfigurator.hh>
diff --git a/shibsp/remoting/impl/SocketListener.cpp b/shibsp/remoting/impl/SocketListener.cpp
index 46c3adb..e211b20 100644
--- a/shibsp/remoting/impl/SocketListener.cpp
+++ b/shibsp/remoting/impl/SocketListener.cpp
@@ -25,7 +25,6 @@
 #include "ServiceProvider.h"
 #include "remoting/impl/SocketListener.h"
 
-#include <memory>
 #include <errno.h>
 #include <stack>
 #include <sstream>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list