[cpp-xmltooling COMMIT] in /branches/REL_1: configure.ac cpp-xmltooling.sln xmltooling/XMLToolingConfig.cpp xmltoolin...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Dec  3 22:53:01 2011
New Revision: 929

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=929&view=rev
Log:
Incorporating boostisms

Modified:
    branches/REL_1/configure.ac
    branches/REL_1/cpp-xmltooling.sln
    branches/REL_1/xmltooling/XMLToolingConfig.cpp
    branches/REL_1/xmltooling/impl/MemoryStorageService.cpp
    branches/REL_1/xmltooling/io/HTTPRequest.cpp
    branches/REL_1/xmltooling/io/HTTPResponse.cpp
    branches/REL_1/xmltooling/security/AbstractPKIXTrustEngine.h
    branches/REL_1/xmltooling/security/ChainingTrustEngine.h
    branches/REL_1/xmltooling/security/impl/AbstractPKIXTrustEngine.cpp
    branches/REL_1/xmltooling/security/impl/ChainingCredentialResolver.cpp
    branches/REL_1/xmltooling/security/impl/ChainingTrustEngine.cpp
    branches/REL_1/xmltooling/security/impl/InlineKeyResolver.cpp
    branches/REL_1/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
    branches/REL_1/xmltoolingtest/PKIXEngineTest.h

Modified: branches/REL_1/configure.ac
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/configure.ac?rev=929&r1=928&r2=929&view=diff
==============================================================================
--- branches/REL_1/configure.ac (original)
+++ branches/REL_1/configure.ac Sat Dec  3 22:53:01 2011
@@ -95,8 +95,9 @@
 
 # Boost
 BOOST_REQUIRE
+BOOST_BIND
+BOOST_LAMBDA
 BOOST_STRING_ALGO
-BOOST_LAMBDA
 
 # are covariant methods allowed?
 AC_LINK_IFELSE(

Modified: branches/REL_1/cpp-xmltooling.sln
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/cpp-xmltooling.sln?rev=929&r1=928&r2=929&view=diff
==============================================================================
--- branches/REL_1/cpp-xmltooling.sln (original)
+++ branches/REL_1/cpp-xmltooling.sln Sat Dec  3 22:53:01 2011
@@ -6,6 +6,7 @@
 		m4\acinclude.m4 = m4\acinclude.m4
 		m4\acx_pthread.m4 = m4\acx_pthread.m4
 		m4\ax_create_pkgconfig_info.m4 = m4\ax_create_pkgconfig_info.m4
+		..\cpp-sp-ext\m4\boost.m4 = ..\cpp-sp-ext\m4\boost.m4
 		config_win32.h = config_win32.h
 		configure.ac = configure.ac
 		doxygen.am = doxygen.am

Modified: branches/REL_1/xmltooling/XMLToolingConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/XMLToolingConfig.cpp?rev=929&r1=928&r2=929&view=diff
==============================================================================
--- branches/REL_1/xmltooling/XMLToolingConfig.cpp (original)
+++ branches/REL_1/xmltooling/XMLToolingConfig.cpp Sat Dec  3 22:53:01 2011
@@ -56,8 +56,8 @@
 
 #include <stdexcept>
 #include <boost/algorithm/string.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
+#include <boost/bind.hpp>
+#include <boost/ptr_container/ptr_vector.hpp>
 
 #if defined(XMLTOOLING_LOG4SHIB)
 # include <log4shib/PropertyConfigurator.hh>
@@ -82,7 +82,6 @@
 using namespace xmltooling::logging;
 using namespace xmltooling;
 using namespace xercesc;
-using namespace boost::lambda;
 using namespace boost;
 using namespace std;
 
@@ -114,14 +113,14 @@
 namespace {
     static XMLToolingInternalConfig g_config;
 #ifndef XMLTOOLING_NO_XMLSEC
-    static vector<Mutex*> g_openssl_locks;
+    static ptr_vector<Mutex> g_openssl_locks;
 
     extern "C" void openssl_locking_callback(int mode,int n,const char *file,int line)
     {
         if (mode & CRYPTO_LOCK)
-            g_openssl_locks[n]->lock();
+            g_openssl_locks[n].lock();
         else
-            g_openssl_locks[n]->unlock();
+            g_openssl_locks[n].unlock();
     }
 
 # ifndef WIN32
@@ -431,7 +430,7 @@
             for_each(
                 catpaths.begin(), catpaths.end(),
                 // Call loadCatalog with an inner call to s->c_str() on each entry.
-                lambda::bind(static_cast<bool (ParserPool::*)(const char*)>(&ParserPool::loadCatalog), m_validatingPool, lambda::bind(&string::c_str,_1))
+                boost::bind(static_cast<bool (ParserPool::*)(const char*)>(&ParserPool::loadCatalog), m_validatingPool, boost::bind(&string::c_str,_1))
                 );
         }
 
@@ -520,8 +519,7 @@
 
 #ifndef XMLTOOLING_NO_XMLSEC
     CRYPTO_set_locking_callback(nullptr);
-    for_each(g_openssl_locks.begin(), g_openssl_locks.end(), xmltooling::cleanup<Mutex>());
-    g_openssl_locks.clear();
+    g_openssl_locks.release();
 #endif
 
     SchemaValidators.destroyValidators();

Modified: branches/REL_1/xmltooling/impl/MemoryStorageService.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/impl/MemoryStorageService.cpp?rev=929&r1=928&r2=929&view=diff
==============================================================================
--- branches/REL_1/xmltooling/impl/MemoryStorageService.cpp (original)
+++ branches/REL_1/xmltooling/impl/MemoryStorageService.cpp Sat Dec  3 22:53:01 2011
@@ -116,9 +116,9 @@
         }
 
         map<string,Context> m_contextMap;
-        RWLock* m_lock;
-        CondWait* shutdown_wait;
-        Thread* cleanup_thread;
+        auto_ptr<RWLock> m_lock;
+        auto_ptr<CondWait> shutdown_wait;

[... 705 lines stripped ...]