summaryrefslogtreecommitdiffstats
path: root/runtime/class_linker.cc
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-07-26 10:54:15 -0700
committerBrian Carlstrom <bdc@google.com>2013-07-26 11:55:10 -0700
commit7934ac288acfb2552bb0b06ec1f61e5820d924a4 (patch)
tree43f3acd8af7fd34d4ae7b64f6e06bb8429d74bb8 /runtime/class_linker.cc
parentfb331d7ca004f39608fcfdae49d38df90c702ea9 (diff)
downloadandroid_art-7934ac288acfb2552bb0b06ec1f61e5820d924a4.tar.gz
android_art-7934ac288acfb2552bb0b06ec1f61e5820d924a4.tar.bz2
android_art-7934ac288acfb2552bb0b06ec1f61e5820d924a4.zip
Fix cpplint whitespace/comments issues
Change-Id: Iae286862c85fb8fd8901eae1204cd6d271d69496
Diffstat (limited to 'runtime/class_linker.cc')
-rw-r--r--runtime/class_linker.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 15d6d366ab..40033b7743 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1422,7 +1422,7 @@ size_t ClassLinker::SizeOfClass(const DexFile& dex_file,
// follow with reference fields which must be contiguous at start
size += (num_ref * sizeof(uint32_t));
// if there are 64-bit fields to add, make sure they are aligned
- if (num_64 != 0 && size != RoundUp(size, 8)) { // for 64-bit alignment
+ if (num_64 != 0 && size != RoundUp(size, 8)) { // for 64-bit alignment
if (num_32 != 0) {
// use an available 32-bit field for padding
num_32--;
@@ -3476,7 +3476,7 @@ bool ClassLinker::LinkFields(SirtRef<mirror::Class>& klass, bool is_static) {
Primitive::Type type = fh.GetTypeAsPrimitiveType();
bool isPrimitive = type != Primitive::kPrimNot;
if (isPrimitive) {
- break; // past last reference, move on to the next phase
+ break; // past last reference, move on to the next phase
}
grouped_and_sorted_fields.pop_front();
num_reference_fields++;
@@ -3554,7 +3554,7 @@ bool ClassLinker::LinkFields(SirtRef<mirror::Class>& klass, bool is_static) {
bool is_primitive = type != Primitive::kPrimNot;
if (StringPiece(ClassHelper(klass.get(), this).GetDescriptor()) == "Ljava/lang/ref/Reference;" &&
StringPiece(fh.GetName()) == "referent") {
- is_primitive = true; // We lied above, so we have to expect a lie here.
+ is_primitive = true; // We lied above, so we have to expect a lie here.
}
if (is_primitive) {
if (!seen_non_ref) {