ICU-1962 fix bad conflict merge

X-SVN-Rev: 8978
This commit is contained in:
Markus Scherer 2002-06-29 00:15:00 +00:00
parent 11948b52df
commit c16c9ab43e

View file

@ -148,6 +148,13 @@ public:
*/
static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
/**
* Return the set of all characters that may be modified
* (getTarget=false) or emitted (getTarget=true) by this set.
*/
UnicodeSet& getSourceTargetSet(UnicodeSet& result,
UBool getTarget) const;
private:
/**
@ -155,13 +162,6 @@ private:
* for ICU "poor man's RTTI".
*/
static const char fgClassID;
/**
* Return the set of all characters that may be modified
* (getTarget=false) or emitted (getTarget=true) by this set.
*/
UnicodeSet& getSourceTargetSet(UnicodeSet& result,
UBool getTarget) const;
};
U_NAMESPACE_END