summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stefano Cianciulli <scianciulli@google.com> 2022-07-20 08:56:12 +0000
committer Stefano Cianciulli <scianciulli@google.com> 2022-07-20 12:48:38 +0000
commit92e70bd8639c0d65518f519ecb250f004c5d8d3d (patch)
treedb7e6ebfa040337c94dec8fd885ef474363ede20
parent59f2219794e9fa9059876c4eea8fc3107dd804be (diff)
Remove comments for dlmalloc inclusions
Removing comments when including dlmalloc, as they can be mistaken for the explanation of why the NOLINT directive was needed, especially when including dlmalloc.c (clang-tidy would report a violation of the bugprone-suspicious-include check, which has nothing to do with the fact that it's included from external/dlmalloc). Test: m Change-Id: I6bd0ea3b266da52f4d151a358a2945cadd2c5c60
-rw-r--r--runtime/gc/allocator/art-dlmalloc.cc2
-rw-r--r--runtime/gc/allocator/art-dlmalloc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/allocator/art-dlmalloc.cc b/runtime/gc/allocator/art-dlmalloc.cc
index e2dda707ae..3340b21f51 100644
--- a/runtime/gc/allocator/art-dlmalloc.cc
+++ b/runtime/gc/allocator/art-dlmalloc.cc
@@ -39,7 +39,7 @@ static void art_heap_usage_error(const char* function, void* p);
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
#pragma GCC diagnostic ignored "-Wexpansion-to-defined"
-#include "dlmalloc.c" // NOLINT - from external/dlmalloc
+#include "dlmalloc.c"
// Note: dlmalloc.c uses a DEBUG define to drive debug code. This interferes with the DEBUG severity
// of libbase, so undefine it now.
#undef DEBUG
diff --git a/runtime/gc/allocator/art-dlmalloc.h b/runtime/gc/allocator/art-dlmalloc.h
index a839904515..296de72c70 100644
--- a/runtime/gc/allocator/art-dlmalloc.h
+++ b/runtime/gc/allocator/art-dlmalloc.h
@@ -33,7 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
-#include "dlmalloc.h" // from external/dlmalloc
+#include "dlmalloc.h"
#pragma GCC diagnostic pop
// Callback for dlmalloc_inspect_all or mspace_inspect_all that will madvise(2) unused