organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-10802 Attempt to fix broken build.

Browse source 
X-SVN-Rev: 36215
This commit is contained in:
Travis Keep 2014-08-20 23:19:14 +00:00
parent f335b55bdf
commit d9af7aa3db
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/common/unifiedcache.h
View file

@ -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();

4
icu4c/source/test/intltest/tsmthred.cpp
View file

@ -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) {};

5
icu4c/source/test/intltest/unifiedcachetest.cpp
View file

@ -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() {