Fixing cpplint readability/constructors issues
Change-Id: Idea2685007de2051f2be51a84d8956a142804402
diff --git a/Android.mk b/Android.mk
index 94b7a65..437513b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -334,7 +334,7 @@
.PHONY: cpplint-art
cpplint-art:
./art/tools/cpplint.py \
- --filter=-,+build/header_guard,+whitespace/braces,+whitespace/comma,+runtime/explicit,+whitespace/newline,+whitespace/parens,+build/namespaces,+readability/fn_size,+whitespace/operators,+readability/braces,+whitespace/indent,+whitespace/blank_line,+whitespace/end_of_line,+whitespace/labels,+whitespace/semicolon,+legal/copyright,+readability/casting,+readability/check \
+ --filter=-,+build/header_guard,+whitespace/braces,+whitespace/comma,+runtime/explicit,+whitespace/newline,+whitespace/parens,+build/namespaces,+readability/fn_size,+whitespace/operators,+readability/braces,+whitespace/indent,+whitespace/blank_line,+whitespace/end_of_line,+whitespace/labels,+whitespace/semicolon,+legal/copyright,+readability/casting,+readability/check,+readability/constructors \
$(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION) | grep -v art/compiler/llvm/generated/)
# "mm cpplint-art-aspirational" to see warnings we would like to fix
diff --git a/runtime/base/logging.h b/runtime/base/logging.h
index f02a39a..af2cdb3 100644
--- a/runtime/base/logging.h
+++ b/runtime/base/logging.h
@@ -215,10 +215,7 @@
size_t byte_count_;
bool show_actual_addresses_;
- // TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(HexDump);
-#endif
};
std::ostream& operator<<(std::ostream& os, const HexDump& rhs);
@@ -240,10 +237,7 @@
private:
T& value_;
-// TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(Dumpable);
-#endif
};
template<typename T>
@@ -266,10 +260,7 @@
private:
T& value_;
-// TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(MutatorLockedDumpable);
-#endif
};
template<typename T>
diff --git a/runtime/oat/utils/mips/assembler_mips.h b/runtime/oat/utils/mips/assembler_mips.h
index eeb4a57..8f4a33a 100644
--- a/runtime/oat/utils/mips/assembler_mips.h
+++ b/runtime/oat/utils/mips/assembler_mips.h
@@ -114,10 +114,7 @@
friend class MipsAssembler;
- // TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(Operand);
-#endif
};
@@ -193,10 +190,7 @@
private:
Address() {}
- // TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(Address);
-#endif
};
#endif
diff --git a/runtime/oat/utils/x86/assembler_x86.h b/runtime/oat/utils/x86/assembler_x86.h
index 3f40a54..e0fbe0e 100644
--- a/runtime/oat/utils/x86/assembler_x86.h
+++ b/runtime/oat/utils/x86/assembler_x86.h
@@ -42,10 +42,7 @@
private:
const int32_t value_;
- // TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(Immediate);
-#endif
};
@@ -133,10 +130,7 @@
friend class X86Assembler;
- // TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(Operand);
-#endif
};
@@ -212,10 +206,7 @@
private:
Address() {}
- // TODO: Remove the #if when Mac OS build server no longer uses GCC 4.2.*.
-#if GCC_VERSION >= 40300
DISALLOW_COPY_AND_ASSIGN(Address);
-#endif
};
diff --git a/runtime/verifier/reg_type_cache.h b/runtime/verifier/reg_type_cache.h
index 2411758..77f5893 100644
--- a/runtime/verifier/reg_type_cache.h
+++ b/runtime/verifier/reg_type_cache.h
@@ -152,12 +152,12 @@
static void CreatePrimitiveTypes() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
// Whether or not we're allowed to load classes.
const bool can_load_classes_;
- DISALLOW_COPY_AND_ASSIGN(RegTypeCache);
mirror::Class* ResolveClass(const char* descriptor, mirror::ClassLoader* loader)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
void ClearException();
bool MatchDescriptor(size_t idx, const char* descriptor, bool precise)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ DISALLOW_COPY_AND_ASSIGN(RegTypeCache);
};
} // namespace verifier