From 7890e2edd305ddacfe76b37337cdbe95bcd588f8 Mon Sep 17 00:00:00 2001
From: "Christopher R. Palmer" <crpalmer@gmail.com>
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 <radian.dc@gmail.com>
---
 compiler/driver/compiler_driver.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'compiler/driver/compiler_driver.cc')

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index d150ed0a6d..cebe44f4f8 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -2538,8 +2538,7 @@ bool CompilerDriver::IsStringInit(uint32_t method_index, const DexFile* dex_file
   return inliner->IsStringInitMethodIndex(method_index);
 }
 
-SafeMap<int32_t, int32_t> *CompilerDriver::GetStatusMap(Thread *)
-{
+SafeMap<int32_t, int32_t> *CompilerDriver::GetStatusMap(Thread *) {
   return nullptr;
 }
 
-- 
cgit v1.2.3