From e2cbfc7916a9fe920c9d3112b8f48eb705a9eb89 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Tue, 19 Dec 2006 03:42:52 +0000 Subject: [PATCH] Rename exception macros to avoid conflicts. --- saml/SAMLConfig.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp index 48a8175..9afed24 100644 --- a/saml/SAMLConfig.cpp +++ b/saml/SAMLConfig.cpp @@ -67,9 +67,9 @@ extern "C" void SAML_API xmltooling_extension_term() SAMLConfig::getConfig().term(false); } -DECL_EXCEPTION_FACTORY(ArtifactException,opensaml); -DECL_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md); -DECL_EXCEPTION_FACTORY(BindingException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml); +DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md); +DECL_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml); namespace opensaml { SAMLInternalConfig g_config; @@ -110,9 +110,9 @@ bool SAMLInternalConfig::init(bool initXMLTooling) log.debug("XMLTooling library initialized"); } - REGISTER_EXCEPTION_FACTORY(ArtifactException,opensaml); - REGISTER_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md); - REGISTER_EXCEPTION_FACTORY(BindingException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md); + REGISTER_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml); saml1::registerAssertionClasses(); saml1p::registerProtocolClasses(); -- 2.1.4