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

ICU-20353 Fix MSVC Warning/Error C4251 with CodePointMatcherWarehouse and MemoryPool.

Browse source
This commit is contained in:
Jeff Genovy 2019-01-14 14:46:29 -08:00 • committed by Jeff Genovy
parent 25380f6f81
commit b0a372ac9a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4c/source/common/cmemory.h
View file

@ -285,7 +285,7 @@ inline T *LocalMemory<T>::allocateInsteadAndCopy(int32_t newCapacity, int32_t le
*
* WARNING: MaybeStackArray only works with primitive (plain-old data) types.
* It does NOT know how to call a destructor! If you work with classes with
* destructors, consider LocalArray in localpointer.h.
* destructors, consider LocalArray in localpointer.h or MemoryPool.
*/
template<typename T, int32_t stackCapacity>
class MaybeStackArray {
@ -692,9 +692,8 @@ inline H *MaybeStackHeaderAndArray<H, T, stackCapacity>::orphanOrClone(int32_t l
*
* It doesn't do anything more than that, and is intentionally kept minimalist.
*/
template<typename T>
template<typename T, int32_t stackCapacity = 8>
class MemoryPool : public UMemory {
enum { STACK_CAPACITY = 8 };
public:
MemoryPool() : count(0), pool() {}
@ -730,7 +729,7 @@ public:
T* create(Args&&... args) {
int32_t capacity = pool.getCapacity();
if (count == capacity &&
pool.resize(capacity == STACK_CAPACITY ? 32 : 2 * capacity,
pool.resize(capacity == stackCapacity ? 4 * capacity : 2 * capacity,
capacity) == nullptr) {
return nullptr;
}
@ -739,7 +738,7 @@ public:
private:
int32_t count;
MaybeStackArray<T*, STACK_CAPACITY> pool;
MaybeStackArray<T*, stackCapacity> pool;
};
U_NAMESPACE_END

7
icu4c/source/i18n/numparse_affixes.h
View file

@ -47,13 +47,14 @@ class CodePointMatcher : public NumberParseMatcher, public UMemory {
} // namespace impl
} // namespace numparse
// Export a explicit template instantiations of MaybeStackArray and CompactUnicodeString.
// Export a explicit template instantiations of MaybeStackArray, MemoryPool and CompactUnicodeString.
// When building DLLs for Windows this is required even though no direct access leaks out of the i18n library.
// (See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples.)
// Note: These need to be outside of the impl::numparse namespace, or Clang will generate a compile error.
// Note: These need to be outside of the numparse::impl namespace, or Clang will generate a compile error.
#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN
template class U_I18N_API MaybeStackArray<numparse::impl::CodePointMatcher*, 8>;
template class U_I18N_API MaybeStackArray<UChar, 4>;
template class U_I18N_API MaybeStackArray<numparse::impl::CodePointMatcher*, 3>;
template class U_I18N_API MemoryPool<numparse::impl::CodePointMatcher, 8>;
template class U_I18N_API numparse::impl::CompactUnicodeString<4>;
#endif