summaryrefslogtreecommitdiff
path: root/src/compiler_llvm/method_compiler.h
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2013-02-01 21:45:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-02-01 21:45:39 +0000
commit5d78f9c6045878c9e448d47b688dd89eaf476a83 (patch)
tree32850692eb4565a4ee3eaf122da32debec45b4c2 /src/compiler_llvm/method_compiler.h
parente9de2dd6bd51f9be3457b5e2ffdd97f457ddebcb (diff)
parent641ce0371c2f0dc95d26be02d8366124c8b66653 (diff)
Merge "Rename compiler_llvm CompilationUnit to LlvmCompilationUnit" into dalvik-dev
Diffstat (limited to 'src/compiler_llvm/method_compiler.h')
-rw-r--r--src/compiler_llvm/method_compiler.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index dd9d1829c3..4d759e501a 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -64,14 +64,14 @@ namespace llvm {
namespace art {
namespace compiler_llvm {
-class CompilationUnit;
+class LlvmCompilationUnit;
class CompilerLLVM;
class DalvikReg;
class IRBuilder;
class MethodCompiler {
public:
- MethodCompiler(CompilationUnit* cunit,
+ MethodCompiler(LlvmCompilationUnit* cunit,
Compiler* compiler,
OatCompilationUnit* oat_compilation_unit);
@@ -447,7 +447,7 @@ class MethodCompiler {
void ComputeMethodInfo();
private:
- CompilationUnit* cunit_;
+ LlvmCompilationUnit* cunit_;
Compiler* compiler_;
const DexFile* dex_file_;