X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Finternal.h;h=a01701662d152a5e832670486861b0f32cdcc1bb;hp=2946c103f04063c5cdff42525a6b54b6a6c22448;hb=db44995ea6c326dcb51387a888da823c5d86c866;hpb=31609e12fb3201ea556d24732947756cda34daeb

diff --git a/saml/internal.h b/saml/internal.h
index 2946c10..a017016 100644
--- a/saml/internal.h
+++ b/saml/internal.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * 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
+/**
+ * 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.
+ *
+ * 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.
  */
 
 /*
@@ -24,6 +28,7 @@
 #ifdef WIN32
 # define _CRT_SECURE_NO_DEPRECATE 1
 # define _CRT_NONSTDC_NO_DEPRECATE 1
+# define _SCL_SECURE_NO_WARNINGS 1
 #endif
 
 // Export public APIs
@@ -40,6 +45,9 @@
 #include "SAMLConfig.h"
 
 #include <limits.h>
+#include <vector>
+#include <boost/scoped_ptr.hpp>
+#include <xmltooling/unicode.h>
 
 using namespace xercesc;
 
@@ -72,11 +80,7 @@ using namespace xercesc;
 #endif
 #endif
 
-#if SIZEOF_TIME_T == 8
-# define SAMLTIME_MAX LLONG_MAX
-#elif SIZEOF_TIME_T == 4
-# define SAMLTIME_MAX INT_MAX
-#endif
+#define SAMLTIME_MAX (sizeof(time_t) == 8 ? LLONG_MAX : INT_MAX)
 
 #define SAML_LOGCAT "OpenSAML"
 
@@ -103,10 +107,14 @@ namespace opensaml {
         void generateRandomBytes(std::string& buf, unsigned int len);
         XMLCh* generateIdentifier();
         std::string hashSHA1(const char* data, bool toHex=false);
+        void setContactPriority(const XMLCh*);
+        const saml2md::ContactPerson* getContactPerson(const saml2md::EntityDescriptor&) const;
+        const saml2md::ContactPerson* getContactPerson(const saml2md::RoleDescriptor&) const;
 
     private:
         int m_initCount;
-        xmltooling::Mutex* m_lock;
+        boost::scoped_ptr<xmltooling::Mutex> m_lock;
+        std::vector<xmltooling::xstring> m_contactPriority;
     };
     /// @endcond