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-12619 fix headers (BRS) merge from r38912

Browse source 
X-SVN-Rev: 38916
This commit is contained in:
Steven R. Loomis 2016-07-01 17:01:51 +00:00
parent 0c5b2b597d
commit ad1cf1e346
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,6 @@ U_NAMESPACE_BEGIN
class BytesTrieElement;
class CharString;
/**
* Builder class for BytesTrie.
*
@ -143,7 +142,7 @@ private:
virtual int32_t getMinLinearMatch() const { return BytesTrie::kMinLinearMatch; }
virtual int32_t getMaxLinearMatchLength() const { return BytesTrie::kMaxLinearMatchLength; }
// don't use #ifndef U_HIDE_INTERNAL_API with private class members
#ifndef U_HIDE_INTERNAL_API
/**
* @internal
*/
@ -155,7 +154,8 @@ 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,
Node *nextNode) const;

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

@ -150,6 +150,7 @@ 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);
@ -158,6 +159,7 @@ private:
private:
const UChar *s;
};
#endif
virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length,
Node *nextNode) const;

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

@ -1936,7 +1936,6 @@ public:
* @draft ICU 56
*/
void swap(UnicodeString &other) U_NOEXCEPT;
#endif /* U_HIDE_DRAFT_API */
/**
* Non-member UnicodeString swap function.
@ -1948,6 +1947,7 @@ public:
swap(UnicodeString &s1, UnicodeString &s2) U_NOEXCEPT {
s1.swap(s2);
}
#endif /* U_HIDE_DRAFT_API */
/**
* Assignment operator. Replace the characters in this UnicodeString