diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2014-03-03 19:58:30 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2014-03-03 19:58:30 +0000 |
| commit | b2f034b85e001fd79617f2124560509583118c13 (patch) | |
| tree | 9fc514eac26b2618a66f7c9c19a858f6f8c4bc62 /llvm/lib/IR/ConstantsContext.h | |
| parent | 23d72e8465f73c7fda4be0018092f0f7e8a21eea (diff) | |
| download | bcm5719-llvm-b2f034b85e001fd79617f2124560509583118c13.tar.gz bcm5719-llvm-b2f034b85e001fd79617f2124560509583118c13.zip | |
[C++11] Use std::tie to simplify compare operators.
No functionality change.
llvm-svn: 202751
Diffstat (limited to 'llvm/lib/IR/ConstantsContext.h')
| -rw-r--r-- | llvm/lib/IR/ConstantsContext.h | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/llvm/lib/IR/ConstantsContext.h b/llvm/lib/IR/ConstantsContext.h index 32bed95e212..64f835b005a 100644 --- a/llvm/lib/IR/ConstantsContext.h +++ b/llvm/lib/IR/ConstantsContext.h @@ -334,14 +334,10 @@ struct ExprMapKeyType { this->indices == that.indices; } bool operator<(const ExprMapKeyType & that) const { - if (this->opcode != that.opcode) return this->opcode < that.opcode; - if (this->operands != that.operands) return this->operands < that.operands; - if (this->subclassdata != that.subclassdata) - return this->subclassdata < that.subclassdata; - if (this->subclassoptionaldata != that.subclassoptionaldata) - return this->subclassoptionaldata < that.subclassoptionaldata; - if (this->indices != that.indices) return this->indices < that.indices; - return false; + return std::tie(opcode, operands, subclassdata, subclassoptionaldata, + indices) < + std::tie(that.opcode, that.operands, that.subclassdata, + that.subclassoptionaldata, that.indices); } bool operator!=(const ExprMapKeyType& that) const { @@ -369,17 +365,10 @@ struct InlineAsmKeyType { this->asm_dialect == that.asm_dialect; } bool operator<(const InlineAsmKeyType& that) const { - if (this->asm_string != that.asm_string) - return this->asm_string < that.asm_string; - if (this->constraints != that.constraints) - return this->constraints < that.constraints; - if (this->has_side_effects != that.has_side_effects) - return this->has_side_effects < that.has_side_effects; - if (this->is_align_stack != that.is_align_stack) - return this->is_align_stack < that.is_align_stack; - if (this->asm_dialect != that.asm_dialect) - return this->asm_dialect < that.asm_dialect; - return false; + return std::tie(asm_string, constraints, has_side_effects, is_align_stack, + asm_dialect) < + std::tie(that.asm_string, that.constraints, that.has_side_effects, + that.is_align_stack, that.asm_dialect); } bool operator!=(const InlineAsmKeyType& that) const { |
