Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,22 +1,22 @@
$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.2 2015/10/23 07:35:08 pettai Exp $
--- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig 2013-09-29 08:55:53.000000000 +0000
+++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp
@@ -240,7 +240,7 @@ ChainingAttributeResolver::ChainingAttri
--- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig 2015-10-19 17:29:03.000000000 -0700
+++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp 2015-10-19 17:29:32.000000000 -0700
@@ -240,7 +240,7 @@
m_resolvers.push_back(np.get());
np.release();
}
- catch (exception& ex) {
+ catch (std::exception& ex) {
Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error(
Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error(
"caught exception processing embedded AttributeResolver element: %s", ex.what()
);
@@ -274,7 +274,7 @@ void ChainingAttributeResolver::resolveA
@@ -274,7 +274,7 @@
chain.m_ownedAssertions.insert(chain.m_ownedAssertions.end(), context->getResolvedAssertions().begin(), context->getResolvedAssertions().end());
context->getResolvedAssertions().clear();
}
- catch (exception& ex) {
+ catch (std::exception& ex) {
Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error(
Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error(
"caught exception applying AttributeResolver in chain: %s", ex.what()
);