ICU-10802 Attempt to fix broken build.

X-SVN-Rev: 36215

diff --git a/icu4c/source/common/unifiedcache.h b/icu4c/source/common/unifiedcache.h
index 61609cf125fca0c80a88c48e37416f3680c6700e..e01d1e6232f9aad10d098fd0ab0cca0b36f2dff2 100644 (file)
--- a/icu4c/source/common/unifiedcache.h
+++ b/icu4c/source/common/unifiedcache.h
@@ -38,7 +38,7 @@ class U_COMMON_API CacheKeyBase : public UObject {
     * Copy constructor. Needed to support cloning.
     */
    CacheKeyBase(const CacheKeyBase &other) 
-           : creationStatus(other.creationStatus) { }
+           : UObject(other), creationStatus(other.creationStatus) { }
    virtual ~CacheKeyBase();
 
    /**
@@ -135,6 +135,8 @@ class LocaleCacheKey : public CacheKey<T> {
    Locale   fLoc;
  public:
    LocaleCacheKey(const Locale &loc) : fLoc(loc) {};
+   LocaleCacheKey(const LocaleCacheKey &other)
+           : CacheKey<T>(other), fLoc(other.fLoc) { }
    virtual ~LocaleCacheKey() { }
    virtual int32_t hashCode() const {
        return 37 *CacheKey<T>::hashCode() + fLoc.hashCode();

diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp
index 0e687cf6a62af5fdee9a6a6b88405a9c3b0565ed..56adf201605bd4bbcf7e6695a6113651b4e9584c 100644 (file)
--- a/icu4c/source/test/intltest/tsmthred.cpp
+++ b/icu4c/source/test/intltest/tsmthred.cpp
@@ -1716,6 +1716,8 @@ class UCTMultiThreadItem : public SharedObject {
     }
 };
 
+U_NAMESPACE_BEGIN
+
 template<> U_EXPORT
 const UCTMultiThreadItem *LocaleCacheKey<UCTMultiThreadItem>::createObject(
         const void * /*unused*/, UErrorCode & /* status */) const {
@@ -1739,6 +1741,8 @@ const UCTMultiThreadItem *LocaleCacheKey<UCTMultiThreadItem>::createObject(
     return result;
 }
 
+U_NAMESPACE_END
+
 class UnifiedCacheThread: public SimpleThread {
   public:
     UnifiedCacheThread(const char *loc) : fLoc(loc) {};

diff --git a/icu4c/source/test/intltest/unifiedcachetest.cpp b/icu4c/source/test/intltest/unifiedcachetest.cpp
index 004d728cbc325cadaac50915db6b1f3d5a33eb63..042f1a09ffc581518076d1fdd4ae097e2dc2f6d9 100644 (file)
--- a/icu4c/source/test/intltest/unifiedcachetest.cpp
+++ b/icu4c/source/test/intltest/unifiedcachetest.cpp
@@ -26,6 +26,8 @@ class UCTItem : public SharedObject {
 class UCTItem2 : public SharedObject {
 };
 
+U_NAMESPACE_BEGIN
+
 template<> U_EXPORT
 const UCTItem *LocaleCacheKey<UCTItem>::createObject(
         const void * /*unused*/, UErrorCode &status) const {
@@ -52,6 +54,9 @@ const UCTItem2 *LocaleCacheKey<UCTItem2>::createObject(
     return NULL;
 }
 
+U_NAMESPACE_END
+
+
 class UnifiedCacheTest : public IntlTest {
 public:
     UnifiedCacheTest() {