Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / ObservableMetadataProvider.h

diff --git a/saml/saml2/metadata/ObservableMetadataProvider.h b/saml/saml2/metadata/ObservableMetadataProvider.h
index e1b1ae5..f652f73 100644 (file)
--- a/saml/saml2/metadata/ObservableMetadataProvider.h
+++ b/saml/saml2/metadata/ObservableMetadataProvider.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,18 @@
 
 #include <saml/saml2/metadata/MetadataProvider.h>
 
+namespace xmltooling {
+    class XMLTOOL_API Mutex;
+};
+
 namespace opensaml {
     
     namespace saml2md {
         
+#if defined (_MSC_VER)
+        #pragma warning( push )
+        #pragma warning( disable : 4251 )
+#endif
         /**
          * A metadata provider that notifies interested parties of changes.
          */
@@ -40,17 +48,14 @@ namespace opensaml {
              * 
              * @param e DOM to supply configuration for provider
              */
-            ObservableMetadataProvider(const DOMElement* e) : MetadataProvider(e) {}
+            ObservableMetadataProvider(const xercesc::DOMElement* e=nullptr);
             
             /**
              * Convenience method for notifying every registered Observer of an event.
              */
-            void emitChangeEvent();
+            virtual void emitChangeEvent() const;
 
         public:
-            /**
-             * Destructor will delete any installed filters.
-             */
             virtual ~ObservableMetadataProvider();
             
             /**
@@ -59,9 +64,9 @@ namespace opensaml {
             class SAML_API Observer {
                 MAKE_NONCOPYABLE(Observer);
             protected:
-                Observer() {}
+                Observer();
             public:
-                virtual ~Observer() {}
+                virtual ~Observer();
         
                 /**
                  * Called when a provider signals an event has occured.
@@ -69,7 +74,7 @@ namespace opensaml {
                  * 
                  * @param provider the provider being observed
                  */
-                virtual void onEvent(MetadataProvider& provider)=0;
+                virtual void onEvent(const ObservableMetadataProvider& provider) const=0;
             };
             
             /**
@@ -77,29 +82,25 @@ namespace opensaml {
              * 
              * @param newObserver metadata observer to add
              */
-            virtual void addObserver(Observer* newObserver) {
-                m_observers.push_back(newObserver);
-            }
+            virtual void addObserver(const Observer* newObserver) const;
 
             /**
-             * Removes a metadata observer. The caller must delete the observer if necessary.
+             * Removes a metadata observer.
              * 
              * @param oldObserver metadata observer to remove
              * @return  the old observer
              */
-            virtual Observer* removeObserver(Observer* oldObserver) {
-                for (std::vector<Observer*>::iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
-                    if (oldObserver==(*i)) {
-                        m_observers.erase(i);
-                        return oldObserver;
-                    }
-                }
-                return NULL;
-            }
+            virtual const Observer* removeObserver(const Observer* oldObserver) const;
 
         private:
-            std::vector<Observer*> m_observers;
+            mutable xmltooling::Mutex* m_observerLock;
+            mutable std::vector<const Observer*> m_observers;
         };
+
+#if defined (_MSC_VER)
+        #pragma warning( pop )
+#endif
+
     };
 };