diff options
| -rw-r--r-- | compiler/utils/scoped_hashtable.h | 6 | ||||
| -rw-r--r-- | runtime/class_linker.cc | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/compiler/utils/scoped_hashtable.h b/compiler/utils/scoped_hashtable.h index 5e6c64b1ee..e38b90eab4 100644 --- a/compiler/utils/scoped_hashtable.h +++ b/compiler/utils/scoped_hashtable.h @@ -19,8 +19,8 @@ #include <map> #include <list> -#ifndef SCOPED_HASHTABLE_ -#define SCOPED_HASHTABLE_ +#ifndef ART_COMPILER_UTILS_SCOPED_HASHTABLE_H_ +#define ART_COMPILER_UTILS_SCOPED_HASHTABLE_H_ namespace utils { template <typename K, typename V> @@ -68,4 +68,4 @@ class ScopedHashtable { }; } // end namespace utils -#endif +#endif // ART_COMPILER_UTILS_SCOPED_HASHTABLE_H_ diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 41ddef54ca..15d6d366ab 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -2301,7 +2301,6 @@ void ClassLinker::VerifyClass(mirror::Class* klass) { bool ClassLinker::VerifyClassUsingOatFile(const DexFile& dex_file, mirror::Class* klass, mirror::Class::Status& oat_file_class_status) { - // If we're compiling, we can only verify the class using the oat file if // we are not compiling the image or if the class we're verifying is not part of // the app. In other words, we will only check for preverification of bootclasspath |