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

diff --git a/saml/internal.h b/saml/internal.h
index 5d66226..a017016 100644
--- a/saml/internal.h
+++ b/saml/internal.h
@@ -45,6 +45,9 @@
 #include "SAMLConfig.h"
 
 #include <limits.h>
+#include <vector>
+#include <boost/scoped_ptr.hpp>
+#include <xmltooling/unicode.h>
 
 using namespace xercesc;
 
@@ -77,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"
 
@@ -108,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