diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-08-16 20:30:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-16 20:30:16 +0000 |
| commit | d2b0f33cf01601f040494f4f882e60f70b527930 (patch) | |
| tree | 6497521dcfdcf2d516830d93371391e4f8f63a23 /compiler/sea_ir | |
| parent | 212ec8f32919d50a1e1cb7ea4b3b91ca938ae4e6 (diff) | |
| parent | 02e25119b15a6f619f17db99f5d05124a5807ff3 (diff) | |
| download | art-d2b0f33cf01601f040494f4f882e60f70b527930.zip art-d2b0f33cf01601f040494f4f882e60f70b527930.tar.gz art-d2b0f33cf01601f040494f4f882e60f70b527930.tar.bz2 | |
Merge "Fix up TODO: c++0x, update cpplint." into dalvik-dev
Diffstat (limited to 'compiler/sea_ir')
| -rw-r--r-- | compiler/sea_ir/ir/regions_test.cc | 2 | ||||
| -rw-r--r-- | compiler/sea_ir/types/type_data_test.cc | 2 | ||||
| -rw-r--r-- | compiler/sea_ir/types/type_inference_visitor.cc | 4 | ||||
| -rw-r--r-- | compiler/sea_ir/types/type_inference_visitor.h | 2 | ||||
| -rw-r--r-- | compiler/sea_ir/types/type_inference_visitor_test.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/compiler/sea_ir/ir/regions_test.cc b/compiler/sea_ir/ir/regions_test.cc index 9813465..8ca51e4 100644 --- a/compiler/sea_ir/ir/regions_test.cc +++ b/compiler/sea_ir/ir/regions_test.cc @@ -56,4 +56,4 @@ TEST_F(RegionsTest, Basics) { EXPECT_EQ(root, preds->at(0)); } -} // namespace art +} // namespace sea_ir diff --git a/compiler/sea_ir/types/type_data_test.cc b/compiler/sea_ir/types/type_data_test.cc index a66ebce..f7a5362 100644 --- a/compiler/sea_ir/types/type_data_test.cc +++ b/compiler/sea_ir/types/type_data_test.cc @@ -38,4 +38,4 @@ TEST_F(TypeDataTest, Basics) { EXPECT_TRUE(byte_type == td.FindTypeOf(second_instruction_id)); } -} // namespace art +} // namespace sea_ir diff --git a/compiler/sea_ir/types/type_inference_visitor.cc b/compiler/sea_ir/types/type_inference_visitor.cc index 3da2fc1..81a8f4d 100644 --- a/compiler/sea_ir/types/type_inference_visitor.cc +++ b/compiler/sea_ir/types/type_inference_visitor.cc @@ -78,9 +78,9 @@ std::vector<const Type*> TypeInferenceVisitor::GetOperandTypes( const Type* TypeInferenceVisitor::MergeTypes(std::vector<const Type*>& types) const { const Type* type = NULL; - if (types.size()>0) { + if (types.size() > 0) { type = *(types.begin()); - if (types.size()>1) { + if (types.size() > 1) { for (std::vector<const Type*>::const_iterator cit = types.begin(); cit != types.end(); cit++) { if (!type->Equals(**cit)) { diff --git a/compiler/sea_ir/types/type_inference_visitor.h b/compiler/sea_ir/types/type_inference_visitor.h index 200b9f0..4bdac38 100644 --- a/compiler/sea_ir/types/type_inference_visitor.h +++ b/compiler/sea_ir/types/type_inference_visitor.h @@ -61,7 +61,7 @@ class TypeInferenceVisitor: public IRVisitor { std::vector<const Type*> GetOperandTypes(InstructionNode* instruction) const; const Type* GetType() { // TODO: Currently multiple defined types are not supported. - if (crt_type_.size()>0) { + if (!crt_type_.empty()) { const Type* single_type = crt_type_.at(0); crt_type_.clear(); return single_type; diff --git a/compiler/sea_ir/types/type_inference_visitor_test.cc b/compiler/sea_ir/types/type_inference_visitor_test.cc index 8a249eb..77acb3d 100644 --- a/compiler/sea_ir/types/type_inference_visitor_test.cc +++ b/compiler/sea_ir/types/type_inference_visitor_test.cc @@ -130,4 +130,4 @@ TEST_F(TypeInferenceVisitorTest, GetOperandTypes) { } -} // namespace art +} // namespace sea_ir |