ICU-64252.0.1.tar.gz

[apple/icu.git] / icuSources / common / serv.h

diff --git a/icuSources/common/serv.h b/icuSources/common/serv.h
index 72f0a9f4aee84d0f5fe22893a0f2eb9ff380d917..e1f69cd4119e5d9db32c296d537fced12121e1ba 100644 (file)
--- a/icuSources/common/serv.h
+++ b/icuSources/common/serv.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /**
  *******************************************************************************
- * Copyright (C) 2001-2006, International Business Machines Corporation.       *
+ * Copyright (C) 2001-2011, International Business Machines Corporation.       *
  * All Rights Reserved.                                                        *
  *******************************************************************************
  */
@@ -211,6 +213,7 @@ public:
   */
 class U_COMMON_API ICUServiceFactory : public UObject {
  public:
+    virtual ~ICUServiceFactory();
 
     /**
      * <p>Create a service object from the key, if this factory
@@ -367,6 +370,8 @@ public:
  */
 class U_COMMON_API ServiceListener : public EventListener {
 public:
+    virtual ~ServiceListener();
+
     /**
      * <p>This method is called when the service changes. At the time of the
      * call this listener is registered with the service.  It must
@@ -431,12 +436,6 @@ private:
   StringPair(const UnicodeString& displayName, const UnicodeString& id);
 };
 
-/**
- * Deleter for StringPairs
- */
-U_CAPI void U_EXPORT2
-userv_deleteStringPair(void *obj);
-
 /*******************************************************************
  * ICUService
  */
@@ -533,11 +532,6 @@ class U_COMMON_API ICUService : public ICUNotifier {
 
  private:
 
-    /**
-     * single lock used by this service.
-     */
-    UMTX lock;
-
     /**
      * Timestamp so iterators can be fail-fast.
      */