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

ICU-13725 Fix last remaining C4251 warnings/errors by bringing back the CurrencyPluralInfoWrapper.

Browse source 
X-SVN-Rev: 41308
This commit is contained in:
Jeff Genovy 2018-05-02 08:18:00 +00:00
parent 6a5349eaae
commit 2d5e369e78
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
icu4c/source/i18n/number_decimfmtprops.h
View file

@ -17,9 +17,6 @@
U_NAMESPACE_BEGIN
namespace number {
namespace impl {
// Export an explicit template instantiation of the LocalPointer that is used as a
// data member of CurrencyPluralInfoWrapper.
// (When building DLLs for Windows this is required.)
@ -30,25 +27,30 @@ template class U_I18N_API LocalPointerBase<CurrencyPluralInfo>;
template class U_I18N_API LocalPointer<CurrencyPluralInfo>;
#endif
namespace number {
namespace impl {
// Exported as U_I18N_API because it is a public member field of exported DecimalFormatProperties
template<typename T>
struct U_I18N_API CopyableLocalPointer {
LocalPointer<T> fPtr;
// Using this wrapper is rather unfortunate, but is needed on Windows platforms in order to allow
// for DLL-exporting an fully specified template instantiation.
class U_I18N_API CurrencyPluralInfoWrapper {
public:
LocalPointer<CurrencyPluralInfo> fPtr;
CopyableLocalPointer() = default;
CurrencyPluralInfoWrapper() = default;
CopyableLocalPointer(const CopyableLocalPointer& other) {
if (!other.fPtr.isNull()) {
fPtr.adoptInstead(new T(*other.fPtr));
}
}
CurrencyPluralInfoWrapper(const CurrencyPluralInfoWrapper& other) {
if (!other.fPtr.isNull()) {
fPtr.adoptInstead(new CurrencyPluralInfo(*other.fPtr));
}
}
CopyableLocalPointer& operator=(const CopyableLocalPointer& other) {
if (!other.fPtr.isNull()) {
fPtr.adoptInstead(new T(*other.fPtr));
}
return *this;
}
CurrencyPluralInfoWrapper& operator=(const CurrencyPluralInfoWrapper& other) {
if (!other.fPtr.isNull()) {
fPtr.adoptInstead(new CurrencyPluralInfo(*other.fPtr));
}
return *this;
}
};
/** Controls the set of rules for parsing a string from the old DecimalFormat API. */
@ -91,7 +93,7 @@ struct U_I18N_API DecimalFormatProperties {
public:
NullableValue<UNumberCompactStyle> compactStyle;
NullableValue<CurrencyUnit> currency;
CopyableLocalPointer<CurrencyPluralInfo> currencyPluralInfo;
CurrencyPluralInfoWrapper currencyPluralInfo;
NullableValue<UCurrencyUsage> currencyUsage;
bool decimalPatternMatchRequired;
bool decimalSeparatorAlwaysShown;