From 7890e2edd305ddacfe76b37337cdbe95bcd588f8 Mon Sep 17 00:00:00 2001 From: "Christopher R. Palmer" Date: Sun, 20 Sep 2015 05:49:10 -0400 Subject: art: Fix whitespace errors added by caf All of these errors break compilation with GCC 4.9 and based on a spot check appear to be all CAF introduced changes. Fix these to avoid future breakage. Conflicts: compiler/dex/mir_graph.h compiler/dex/quick/arm/assemble_arm.cc compiler/dex/quick/arm/codegen_arm.h compiler/dex/quick/arm/target_arm.cc compiler/dex/quick/arm64/codegen_arm64.h compiler/dex/quick/arm64/target_arm64.cc compiler/dex/quick/mir_to_lir.h compiler/utils/growable_array.h Changes: compiler/dex/mir_graph.h compiler/dex/mir_optimization.cc compiler/dex/quick/arm/codegen_arm.h compiler/dex/quick/arm/target_arm.cc compiler/dex/quick/mir_to_lir.h compiler/dex/quick/quick_compiler.cc compiler/driver/compiler_driver.cc compiler/optimizing/inliner.cc compiler/optimizing/nodes.cc compiler/optimizing/optimizing_compiler.cc Change-Id: I3e23e1449eea0565fbe6f91251190b1e153f16cf Signed-off-by: AdrianDC --- compiler/dex/mir_graph.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'compiler/dex/mir_graph.h') diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h index a3621967ea..e60172f553 100644 --- a/compiler/dex/mir_graph.h +++ b/compiler/dex/mir_graph.h @@ -377,7 +377,6 @@ class MIR : public ArenaObject { MIR* Copy(MIRGraph* mir_Graph); ExtendedMIR* extraData; - }; struct SuccessorBlockInfo; @@ -1302,7 +1301,7 @@ class MIRGraph { bool SupportMLA() QC_WEAK; void SetPassFail() { pass_failed_ = true; } - bool PassFailed() { return pass_failed_; }; + bool PassFailed() { return pass_failed_; } protected: int FindCommonParent(int block1, int block2); @@ -1520,7 +1519,6 @@ class MIRGraph { public: QCMIRGraph* qcm; - }; } // namespace art -- cgit v1.2.3