Fix a bunch more lint.
(If you ignore the compilers, we've got relatively little lint now. Fits on
a single screen.)
Change-Id: I51389002894d4fd8cf46f79d2bac57079322a030
diff --git a/src/verifier/gc_map.cc b/src/verifier/gc_map.cc
index b9a3ef4..a9d481e 100644
--- a/src/verifier/gc_map.cc
+++ b/src/verifier/gc_map.cc
@@ -52,5 +52,5 @@
return NULL;
}
-} // verifier
-} // art
+} // namespace verifier
+} // namespace art
diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index 7140cca..f6a2ddb 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -132,6 +132,7 @@
}
return std::string(encoding);
}
+
private:
enum {
kInTry,
diff --git a/src/verifier/method_verifier.h b/src/verifier/method_verifier.h
index afbfa16..5f72678 100644
--- a/src/verifier/method_verifier.h
+++ b/src/verifier/method_verifier.h
@@ -160,6 +160,7 @@
#elif defined(ART_USE_GREENLAND_COMPILER)
typedef greenland::InferredRegCategoryMap InferredRegCategoryMap;
#endif
+
public:
enum FailureKind {
kNoFailure,
@@ -210,7 +211,6 @@
static bool IsClassRejected(Compiler::ClassReference ref);
private:
-
explicit MethodVerifier(const DexFile* dex_file, DexCache* dex_cache,
const ClassLoader* class_loader, uint32_t class_def_idx, const DexFile::CodeItem* code_item,
uint32_t method_idx, Method* method, uint32_t access_flags);
diff --git a/src/verifier/reg_type.cc b/src/verifier/reg_type.cc
index 6598458..217084f 100644
--- a/src/verifier/reg_type.cc
+++ b/src/verifier/reg_type.cc
@@ -329,5 +329,5 @@
return os;
}
-} // verifier
-} // art
+} // namespace verifier
+} // namespace art
diff --git a/src/verifier/reg_type_cache.cc b/src/verifier/reg_type_cache.cc
index 53b7a76..c860bd7 100644
--- a/src/verifier/reg_type_cache.cc
+++ b/src/verifier/reg_type_cache.cc
@@ -269,5 +269,5 @@
}
}
-} // verifier
-} // art
+} // namespace verifier
+} // namespace art
diff --git a/src/verifier/reg_type_cache.h b/src/verifier/reg_type_cache.h
index ca0ada6..91a2933 100644
--- a/src/verifier/reg_type_cache.h
+++ b/src/verifier/reg_type_cache.h
@@ -78,6 +78,7 @@
const RegType& IntConstant() { return FromCat1Const(std::numeric_limits<jint>::max()); }
const RegType& GetComponentType(const RegType& array, const ClassLoader* loader);
+
private:
// The allocated entries
std::vector<RegType*> entries_;
diff --git a/src/verifier/register_line.h b/src/verifier/register_line.h
index f214b81..f9a2345 100644
--- a/src/verifier/register_line.h
+++ b/src/verifier/register_line.h
@@ -229,8 +229,8 @@
// Write a bit at each register location that holds a reference
void WriteReferenceBitMap(std::vector<uint8_t>& data, size_t max_bytes);
- private:
+ private:
void CopyRegToLockDepth(size_t dst, size_t src) {
SafeMap<uint32_t, uint32_t>::iterator it = reg_to_lock_depths_.find(src);
if (it != reg_to_lock_depths_.end()) {