maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove use of reserved identifiers in Twine 

llvm-svn: 232310
This commit is contained in:
David Blaikie 2015-03-15 03:17:28 +00:00
parent b253ff3385
commit 503791382b
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/include/llvm/ADT/Twine.h
View File

@ -166,17 +166,16 @@ namespace llvm {
} }
/// Construct a binary twine. /// Construct a binary twine.
explicit Twine(const Twine &_LHS, const Twine &_RHS) explicit Twine(const Twine &LHS, const Twine &RHS)
: LHSKind(TwineKind), RHSKind(TwineKind) { : LHSKind(TwineKind), RHSKind(TwineKind) {
LHS.twine = &_LHS; this->LHS.twine = &LHS;
RHS.twine = &_RHS; this->RHS.twine = &RHS;
assert(isValid() && "Invalid twine!"); assert(isValid() && "Invalid twine!");
} }
/// Construct a twine from explicit values. /// Construct a twine from explicit values.
explicit Twine(Child _LHS, NodeKind _LHSKind, explicit Twine(Child LHS, NodeKind LHSKind, Child RHS, NodeKind RHSKind)
Child _RHS, NodeKind _RHSKind) : LHS(LHS), RHS(RHS), LHSKind(LHSKind), RHSKind(RHSKind) {
: LHS(_LHS), RHS(_RHS), LHSKind(_LHSKind), RHSKind(_RHSKind) {
assert(isValid() && "Invalid twine!"); assert(isValid() && "Invalid twine!");
} }
@ -349,18 +348,18 @@ namespace llvm {
// right thing. Yet. // right thing. Yet.
/// Construct as the concatenation of a C string and a StringRef. /// Construct as the concatenation of a C string and a StringRef.
/*implicit*/ Twine(const char *_LHS, const StringRef &_RHS) /*implicit*/ Twine(const char *LHS, const StringRef &RHS)
: LHSKind(CStringKind), RHSKind(StringRefKind) { : LHSKind(CStringKind), RHSKind(StringRefKind) {
LHS.cString = _LHS; this->LHS.cString = LHS;
RHS.stringRef = &_RHS; this->RHS.stringRef = &RHS;
assert(isValid() && "Invalid twine!"); assert(isValid() && "Invalid twine!");
} }
/// Construct as the concatenation of a StringRef and a C string. /// Construct as the concatenation of a StringRef and a C string.
/*implicit*/ Twine(const StringRef &_LHS, const char *_RHS) /*implicit*/ Twine(const StringRef &LHS, const char *RHS)
: LHSKind(StringRefKind), RHSKind(CStringKind) { : LHSKind(StringRefKind), RHSKind(CStringKind) {
LHS.stringRef = &_LHS; this->LHS.stringRef = &LHS;
RHS.cString = _RHS; this->RHS.cString = RHS;
assert(isValid() && "Invalid twine!"); assert(isValid() && "Invalid twine!");
} }