X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fprofile%2FBrowserSSOProfileValidator.h;h=d0753274e3ff5049848aa548eb6e8f43fb191e56;hb=f1208cd2f514700244816377443c4951dc22c848;hp=9af864ce6e19f349564b2295e0663879b30130ae;hpb=69a716dedfd9e239bcc9206a7b8dc137b43f5f89;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml2/profile/BrowserSSOProfileValidator.h b/saml/saml2/profile/BrowserSSOProfileValidator.h
index 9af864c..d075327 100644
--- a/saml/saml2/profile/BrowserSSOProfileValidator.h
+++ b/saml/saml2/profile/BrowserSSOProfileValidator.h
@@ -1,23 +1,27 @@
-/*
- *  Copyright 2001-2007 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- * 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
+ * UCAID licenses this file to you 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
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
  * @file saml/saml2/profile/BrowserSSOProfileValidator.h
  *
- * SAML 2.0 Browser SSO Profile Assertion Validator
+ * SAML 2.0 Browser SSO Profile Assertion Validator.
  */
 
 #ifndef __saml2_ssoval_h__
@@ -25,10 +29,16 @@
 
 #include <saml/saml2/profile/AssertionValidator.h>
 
-namespace opensaml {
+#include <xmltooling/unicode.h>
 
+namespace opensaml {
     namespace saml2 {
 
+#if defined (_MSC_VER)
+    #pragma warning( push )
+    #pragma warning( disable : 4251 )
+#endif
+
         /**
          * @deprecated
          * SAML 2.0 Browser SSO Profile Assertion Validator
@@ -46,17 +56,17 @@ namespace opensaml {
              * @param audiences     additional audience values
              * @param ts            timestamp to evaluate assertion conditions, or 0 to bypass check
              * @param destination   server location to which assertion was delivered, or 0 to bypass check
-             * @param requestID     ID of request that resulted in assertion, or NULL if unsolicited
+             * @param requestID     ID of request that resulted in assertion, or nullptr if unsolicited
              */
             BrowserSSOProfileValidator(
                 const XMLCh* recipient,
-                const std::vector<const XMLCh*>* audiences=NULL,
+                const std::vector<const XMLCh*>* audiences=nullptr,
                 time_t ts=0,
-                const char* destination=NULL,
-                const char* requestID=NULL
-                ) : AssertionValidator(recipient, audiences, ts), m_destination(destination), m_requestID(requestID) {
-            }
-            virtual ~BrowserSSOProfileValidator() {}
+                const char* destination=nullptr,
+                const char* requestID=nullptr
+                );
+
+            virtual ~BrowserSSOProfileValidator();
 
             void validateAssertion(const Assertion& assertion) const;
 
@@ -65,9 +75,7 @@ namespace opensaml {
              *
              * @return  address information
              */
-            const char* getAddress() const {
-                return m_address.c_str();
-            }
+            const char* getAddress() const;
 
         protected:
             /** Server location to which assertion was delivered. */
@@ -81,6 +89,10 @@ namespace opensaml {
             mutable std::string m_address;
         };
 
+#if defined (_MSC_VER)
+    #pragma warning( pop )
+#endif
+
     };
 };