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

ICU-12738 ICU4C BRS, Some fixes to U_HIDE_XXX_API macros

Browse source 
X-SVN-Rev: 39346
This commit is contained in:
Peter Edberg 2016-09-26 06:53:00 +00:00
parent b0f66e314e
commit bf138d8a85
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/unicode/bytestriebuilder.h
View file

@ -142,7 +142,6 @@ private:
virtual int32_t getMinLinearMatch() const { return BytesTrie::kMinLinearMatch; }
virtual int32_t getMaxLinearMatchLength() const { return BytesTrie::kMaxLinearMatchLength; }
#ifndef U_HIDE_INTERNAL_API
/**
* @internal
*/
@ -154,7 +153,6 @@ private:
private:
const char *s;
};
#endif
// don't use #ifndef U_HIDE_INTERNAL_API with private class members or virtual methods.
virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length,

6
icu4c/source/common/unicode/normlzr.h
View file

@ -181,6 +181,7 @@ public:
* @deprecated ICU 56 Use Normalizer2 instead.
*/
Normalizer(const CharacterIterator& iter, UNormalizationMode mode);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Copy constructor.
@ -188,7 +189,6 @@ public:
* @deprecated ICU 56 Use Normalizer2 instead.
*/
Normalizer(const Normalizer& copy);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Destructor
@ -752,9 +752,7 @@ private:
FilteredNormalizer2*fFilteredNorm2; // owned if not NULL
const Normalizer2 *fNorm2; // not owned; may be equal to fFilteredNorm2
#ifndef U_HIDE_DEPRECATED_API
UNormalizationMode fUMode;
#endif /* U_HIDE_DEPRECATED_API */
UNormalizationMode fUMode; // deprecated
int32_t fOptions;
// The input text and our position in it

2
icu4c/source/common/unicode/ucharstriebuilder.h
View file

@ -150,7 +150,6 @@ private:
virtual int32_t getMinLinearMatch() const { return UCharsTrie::kMinLinearMatch; }
virtual int32_t getMaxLinearMatchLength() const { return UCharsTrie::kMaxLinearMatchLength; }
#ifndef U_HIDE_INTERNAL_API
class UCTLinearMatchNode : public LinearMatchNode {
public:
UCTLinearMatchNode(const UChar *units, int32_t len, Node *nextNode);
@ -159,7 +158,6 @@ private:
private:
const UChar *s;
};
#endif
virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length,
Node *nextNode) const;

4
icu4c/source/i18n/unicode/dtitvinf.h
View file

@ -152,7 +152,8 @@ U_NAMESPACE_BEGIN
class U_I18N_API DateIntervalInfo U_FINAL : public UObject {
public:
#ifndef U_HIDE_INTERNAL_API
// Do not enclose the protected default constructor with #ifndef U_HIDE_INTERNAL_API
// or else the compiler will create a public default constructor.
/**
* Default constructor.
* It does not initialize any interval patterns except
@ -167,7 +168,6 @@ public:
* @internal ICU 4.0
*/
DateIntervalInfo(UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**

2
icu4c/source/i18n/unicode/uspoof.h
View file

@ -576,11 +576,13 @@ typedef enum USpoofChecks {
* @stable ICU 53
*/
USPOOF_RESTRICTION_LEVEL_MASK = 0x7F000000,
#ifndef U_HIDE_INTERNAL_API
/**
* An undefined restriction level.
* @internal
*/
USPOOF_UNDEFINED_RESTRICTIVE = -1
#endif /* U_HIDE_INTERNAL_API */
} URestrictionLevel;
/**