diff options
| author | 2014-05-30 11:08:38 +0000 | |
|---|---|---|
| committer | 2014-05-30 11:08:39 +0000 | |
| commit | d87ca14e850d6cc029419fef41f9212907bda2bf (patch) | |
| tree | 238f10a7578f5133769db6465fa8d7a0d9c8e047 | |
| parent | b827c44f39f66fce600408f82988d6e154627ba7 (diff) | |
| parent | fd5a852e49796374899772381f15c9033dae0057 (diff) | |
Merge "Fix build."
| -rw-r--r-- | compiler/dex/pass_driver_me_post_opt.h | 6 | ||||
| -rw-r--r-- | compiler/dex/post_opt_passes.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/dex/pass_driver_me_post_opt.h b/compiler/dex/pass_driver_me_post_opt.h index adba363a7e..574a6ba04d 100644 --- a/compiler/dex/pass_driver_me_post_opt.h +++ b/compiler/dex/pass_driver_me_post_opt.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DEX_PASS_DRIVER_ME_CLEANUP_H_ -#define ART_COMPILER_DEX_PASS_DRIVER_ME_CLEANUP_H_ +#ifndef ART_COMPILER_DEX_PASS_DRIVER_ME_POST_OPT_H_ +#define ART_COMPILER_DEX_PASS_DRIVER_ME_POST_OPT_H_ #include "pass_driver_me.h" @@ -36,4 +36,4 @@ class PassDriverMEPostOpt : public PassDriverME<PassDriverMEPostOpt> { }; } // namespace art -#endif // ART_COMPILER_DEX_PASS_DRIVER_ME_CLEANUP_H_ +#endif // ART_COMPILER_DEX_PASS_DRIVER_ME_POST_OPT_H_ diff --git a/compiler/dex/post_opt_passes.h b/compiler/dex/post_opt_passes.h index e101fb57d5..f2035052c9 100644 --- a/compiler/dex/post_opt_passes.h +++ b/compiler/dex/post_opt_passes.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DEX_CLEAN_UP_PASSES_H_ -#define ART_COMPILER_DEX_CLEAN_UP_PASSES_H_ +#ifndef ART_COMPILER_DEX_POST_OPT_PASSES_H_ +#define ART_COMPILER_DEX_POST_OPT_PASSES_H_ #include "compiler_internals.h" #include "pass_me.h" @@ -281,4 +281,4 @@ class FreeData : public PassME { } // namespace art -#endif // ART_COMPILER_DEX_CLEAN_UP_PASSES_H_ +#endif // ART_COMPILER_DEX_POST_OPT_PASSES_H_ |