From 1d6e43705df3d9d35f7266743f53094f62673299 Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Wed, 20 Nov 2024 12:08:41 -0500 Subject: [PATCH] CI fixes. --- cpp/src/Slice/MetadataValidator.cpp | 4 ++-- cpp/src/slice2cpp/CPlusPlusUtil.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cpp/src/Slice/MetadataValidator.cpp b/cpp/src/Slice/MetadataValidator.cpp index 49427c6934e..3822e729f98 100644 --- a/cpp/src/Slice/MetadataValidator.cpp +++ b/cpp/src/Slice/MetadataValidator.cpp @@ -305,7 +305,7 @@ Slice::MetadataValidator::isMetadataValid(const MetadataPtr& metadata, const Syn if (isTypeContext) { string msg = '\'' + directive + "' metadata can only be applied to definitions and declarations" + - ", it cannot be applied to type references"; + ", it cannot be applied to type references"; p->unit()->warning(metadata->file(), metadata->line(), InvalidMetadata, msg); isValid = false; } @@ -365,7 +365,7 @@ Slice::MetadataValidator::isMetadataValid(const MetadataPtr& metadata, const Syn if (!validOn.empty() && appliedTo) // 'appliedTo' will be null if we already found a problem and should stop. { auto appliedToPtr = appliedTo.get(); - auto typeComparator = [&](reference_wrapper t) { return t == typeid(*appliedToPtr); }; + auto typeComparator = [&](reference_wrapper t) { return t.get() == typeid(*appliedToPtr); }; if (std::find_if(validOn.begin(), validOn.end(), typeComparator) == validOn.end()) { string message = misappliedMetadataMessage(metadata, appliedTo); diff --git a/cpp/src/slice2cpp/CPlusPlusUtil.cpp b/cpp/src/slice2cpp/CPlusPlusUtil.cpp index 3707deb9e51..449f193992e 100644 --- a/cpp/src/slice2cpp/CPlusPlusUtil.cpp +++ b/cpp/src/slice2cpp/CPlusPlusUtil.cpp @@ -135,7 +135,6 @@ namespace for (const auto& meta : metadata) { string_view directive = meta->directive(); - string_view arguments = meta->arguments(); if (directive == "cpp:view-type") { return true;