Skip to content

Commit 408b18b

Browse files
amykhuangmoheim-qt
authored andcommitted
[Backport] Fix instances of new clang warning -Wmissing-template-arg-list-after-template-kw.
The warning requires a template argument list after using the template keyword. Remove uses of the template keyword where we don't want to specify template types. See llvm/llvm-project#94194 for the upstream clang change. Upstream-Status: Backport [google/perfetto@e2f6619] Bug: 344680447 Change-Id: I85fcb680a6578ea9241d2b1c24d473c56938087a Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/586025 Reviewed-by: Peter Varga <[email protected]> (cherry picked from commit 738d92d) Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/593497 Reviewed-by: Michael Brüning <[email protected]>
1 parent 5c81ae1 commit 408b18b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,13 @@ class TrackEventDataSource
328328
}
329329

330330
static void Flush() {
331-
Base::template Trace([](typename Base::TraceContext ctx) { ctx.Flush(); });
331+
Base::Trace([](typename Base::TraceContext ctx) { ctx.Flush(); });
332332
}
333333

334334
// Determine if *any* tracing category is enabled.
335335
static bool IsEnabled() {
336336
bool enabled = false;
337-
Base::template CallIfEnabled(
338-
[&](uint32_t /*instances*/) { enabled = true; });
337+
Base::CallIfEnabled([&](uint32_t /*instances*/) { enabled = true; });
339338
return enabled;
340339
}
341340

@@ -349,7 +348,7 @@ class TrackEventDataSource
349348
static bool IsDynamicCategoryEnabled(
350349
const DynamicCategory& dynamic_category) {
351350
bool enabled = false;
352-
Base::template Trace([&](typename Base::TraceContext ctx) {
351+
Base::Trace([&](typename Base::TraceContext ctx) {
353352
enabled = enabled || IsDynamicCategoryEnabled(&ctx, dynamic_category);
354353
});
355354
return enabled;
@@ -496,7 +495,7 @@ class TrackEventDataSource
496495
const protos::gen::TrackDescriptor& desc) {
497496
PERFETTO_DCHECK(track.uuid == desc.uuid());
498497
TrackRegistry::Get()->UpdateTrack(track, desc.SerializeAsString());
499-
Base::template Trace([&](typename Base::TraceContext ctx) {
498+
Base::Trace([&](typename Base::TraceContext ctx) {
500499
TrackEventInternal::WriteTrackDescriptor(
501500
track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(),
502501
*ctx.GetCustomTlsState(), TrackEventInternal::GetTraceTime());
@@ -1047,7 +1046,7 @@ class TrackEventDataSource
10471046
Lambda lambda) PERFETTO_ALWAYS_INLINE {
10481047
using CatTraits = CategoryTraits<CategoryType>;
10491048
if (CatTraits::kIsDynamic) {
1050-
Base::template TraceWithInstances(instances, std::move(lambda));
1049+
Base::TraceWithInstances(instances, std::move(lambda));
10511050
} else {
10521051
Base::template TraceWithInstances<CategoryTracePointTraits>(
10531052
instances, std::move(lambda), {CatTraits::GetStaticIndex(category)});
@@ -1061,7 +1060,7 @@ class TrackEventDataSource
10611060
const TrackType& track,
10621061
std::function<void(protos::pbzero::TrackDescriptor*)> callback) {
10631062
TrackRegistry::Get()->UpdateTrack(track, std::move(callback));
1064-
Base::template Trace([&](typename Base::TraceContext ctx) {
1063+
Base::Trace([&](typename Base::TraceContext ctx) {
10651064
TrackEventInternal::WriteTrackDescriptor(
10661065
track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(),
10671066
*ctx.GetCustomTlsState(), TrackEventInternal::GetTraceTime());

0 commit comments

Comments
 (0)