From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 22 May 2009 15:49:22 +0000 (+0000)
Subject: Remove non-xstring code.
X-Git-Tag: 2.2.0~8
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=338f0d4f07bf8390f29776f434eadcf6b6c5bc46

Remove non-xstring code.
---

diff --git a/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp b/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
index 23ef33b..8606f14 100644
--- a/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,19 +50,10 @@ namespace opensaml {
             bool found(const XMLCh* id) const {
                 if (!id)
                     return false;
-#ifdef HAVE_GOOD_STL
                 return m_set.count(id)==1;
-#else
-                auto_ptr_char id2(id);
-                return m_set.count(id2.get())==1;
-#endif
             }
 
-#ifdef HAVE_GOOD_STL
             set<xstring> m_set;
-#else
-            set<string> m_set;
-#endif
         }; 
 
         MetadataFilter* SAML_DLLLOCAL BlacklistMetadataFilterFactory(const DOMElement* const & e)
@@ -80,12 +71,7 @@ BlacklistMetadataFilter::BlacklistMetadataFilter(const DOMElement* e)
     e = XMLHelper::getFirstChildElement(e);
     while (e) {
         if (XMLString::equals(e->getLocalName(), Exclude) && e->hasChildNodes()) {
-#ifdef HAVE_GOOD_STL
             m_set.insert(e->getFirstChild()->getNodeValue());
-#else
-            auto_ptr_char id(e->getFirstChild()->getNodeValue());
-            m_set.insert(id.get());
-#endif
         }
         e = XMLHelper::getNextSiblingElement(e);
     }
diff --git a/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp b/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
index f27a550..6764008 100644
--- a/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2007 Internet2
- * 
+ *  Copyright 2001-2009 Internet2
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,7 +16,7 @@
 
 /**
  * WhitelistMetadataFilter.cpp
- * 
+ *
  * Removes non-whitelisted entities from a metadata instance
  */
 
@@ -34,36 +34,27 @@ using namespace std;
 
 namespace opensaml {
     namespace saml2md {
-                
+
         class SAML_DLLLOCAL WhitelistMetadataFilter : public MetadataFilter
         {
         public:
             WhitelistMetadataFilter(const DOMElement* e);
             ~WhitelistMetadataFilter() {}
-            
+
             const char* getId() const { return WHITELIST_METADATA_FILTER; }
             void doFilter(XMLObject& xmlObject) const;
 
         private:
             void doFilter(EntitiesDescriptor& entities) const;
-            
+
             bool found(const XMLCh* id) const {
                 if (!id)
                     return false;
-#ifdef HAVE_GOOD_STL
                 return m_set.count(id)==1;
-#else
-                auto_ptr_char id2(id);
-                return m_set.count(id2.get())==1;
-#endif
             }
 
-#ifdef HAVE_GOOD_STL
             set<xstring> m_set;
-#else
-            set<string> m_set;
-#endif
-        }; 
+        };
 
         MetadataFilter* SAML_DLLLOCAL WhitelistMetadataFilterFactory(const DOMElement* const & e)
         {
@@ -80,12 +71,7 @@ WhitelistMetadataFilter::WhitelistMetadataFilter(const DOMElement* e)
     e = XMLHelper::getFirstChildElement(e);
     while (e) {
         if (XMLString::equals(e->getLocalName(), Include) && e->hasChildNodes()) {
-#ifdef HAVE_GOOD_STL
             m_set.insert(e->getFirstChild()->getNodeValue());
-#else
-            auto_ptr_char id(e->getFirstChild()->getNodeValue());
-            m_set.insert(id.get());
-#endif
         }
         e = XMLHelper::getNextSiblingElement(e);
     }
@@ -96,7 +82,7 @@ void WhitelistMetadataFilter::doFilter(XMLObject& xmlObject) const
 #ifdef _DEBUG
     NDC ndc("doFilter");
 #endif
-    
+
     try {
         doFilter(dynamic_cast<EntitiesDescriptor&>(xmlObject));
         return;
@@ -112,14 +98,14 @@ void WhitelistMetadataFilter::doFilter(XMLObject& xmlObject) const
     }
     catch (bad_cast) {
     }
-     
+
     throw MetadataFilterException("WhitelistMetadataFilter was given an improper metadata instance to filter.");
 }
 
 void WhitelistMetadataFilter::doFilter(EntitiesDescriptor& entities) const
 {
     Category& log=Category::getInstance(SAML_LOGCAT".MetadataFilter.Whitelist");
-    
+
     VectorOf(EntityDescriptor) v=entities.getEntityDescriptors();
     for (VectorOf(EntityDescriptor)::size_type i=0; i<v.size(); ) {
         const XMLCh* id=v[i]->getEntityID();