Reducing header overuse, non-inlining selected methods (CPPOST-35).

[shibboleth/cpp-sp.git] / shibsp / attribute / filtering / impl / AttributeIssuerRegexFunctor.cpp

diff --git a/shibsp/attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp b/shibsp/attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp
index 7c678ab..b421a11 100644 (file)
--- a/shibsp/attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/AttributeIssuerRegexFunctor.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.
@@ -17,7 +17,7 @@
 /**
  * AttributeIssuerRegexFunctor.cpp
  * 
- * A match function that evaluates to true if the Attribute issuer matches the provided regular\r
+ * A match function that evaluates to true if the Attribute issuer matches the provided regular
  * expression.
  */
 
@@ -25,6 +25,7 @@
 #include "exceptions.h"
 #include "attribute/filtering/FilteringContext.h"
 #include "attribute/filtering/FilterPolicyContext.h"
+#include "attribute/filtering/MatchFunctor.h"
 
 #include <xercesc/util/regx/RegularExpression.hpp>
 
@@ -34,7 +35,7 @@ namespace shibsp {
     static const XMLCh regex[] =    UNICODE_LITERAL_5(r,e,g,e,x);
     
     /**
-     * A match function that evaluates to true if the Attribute issuer matches the provided regular\r
+     * A match function that evaluates to true if the Attribute issuer matches the provided regular
      * expression.
      */
     class SHIBSP_DLLLOCAL AttributeIssuerRegexFunctor : public MatchFunctor
@@ -48,10 +49,10 @@ namespace shibsp {
             try {
                 m_regex = new RegularExpression(r, e->getAttributeNS(NULL,options));
             }
-            catch (XMLException& ex) {\r
-                xmltooling::auto_ptr_char temp(ex.getMessage());\r
-                throw ConfigurationException(temp.get());\r
-            }\r
+            catch (XMLException& ex) {
+                xmltooling::auto_ptr_char temp(ex.getMessage());
+                throw ConfigurationException(temp.get());
+            }
         }
 
         virtual ~AttributeIssuerRegexFunctor() {