Attachment 253420 Details for Bug 281359 – devel/opentelemetry-cpp: fix build with clang 19

[patch] devel/opentelemetry-cpp: fix build with clang 19

devel__opentelemetry-cpp-fix-clang19-build-1.diff (text/plain), 4.49 KB, created by Dimitry Andric on 2024-09-08 09:21:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-09-08 09:21:14 UTC

Size: 4.49 KB

patch

obsolete

>commit 222e5716cc023f17a47b9453661b0b87f64823cd
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-09-08T11:20:21+02:00
>
>    devel/opentelemetry-cpp: fix build with clang 19
>    
>    Clang 19 now implements CWG 96 [1], which requires a template argument
>    list after a 'template' keyword, resulting in errors similar to:
>    
>        /wrkdirs/usr/ports/devel/opentelemetry-cpp/work/opentelemetry-cpp-1.16.1/api/include/opentelemetry/logs/logger_type_traits.h:169:69: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
>          169 |     return LogRecordSetterTrait<common::KeyValueIterable>::template Set(
>              |                                                                     ^
>        /wrkdirs/usr/ports/devel/opentelemetry-cpp/work/opentelemetry-cpp-1.16.1/api/include/opentelemetry/logs/logger.h:76:89: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
>           76 |         detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set(
>              |                                                                                         ^
>        /wrkdirs/usr/ports/devel/opentelemetry-cpp/work/opentelemetry-cpp-1.16.1/api/include/opentelemetry/logs/event_logger.h:69:89: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
>           69 |         detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set(
>              |                                                                                         ^
>    
>    In these cases, appending "<>" is enough to satisfy the constraint.
>    
>    PR:             281359
>    MFH:            2024Q3
>
>diff --git a/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_event__logger.h b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_event__logger.h
>new file mode 100644
>index 000000000000..332f955f1bdf
>--- /dev/null
>+++ b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_event__logger.h
>@@ -0,0 +1,11 @@
>+--- api/include/opentelemetry/logs/event_logger.h.orig	2024-07-17 20:04:10 UTC
>++++ api/include/opentelemetry/logs/event_logger.h
>+@@ -66,7 +66,7 @@ class EventLogger (public)
>+     nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord();
>+ 
>+     IgnoreTraitResult(
>+-        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set(
>++        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>(
>+             log_record.get(), std::forward<ArgumentType>(args))...);
>+ 
>+     EmitEvent(event_name, std::move(log_record));
>diff --git a/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger.h b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger.h
>new file mode 100644
>index 000000000000..dc1c2541b51e
>--- /dev/null
>+++ b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger.h
>@@ -0,0 +1,11 @@
>+--- api/include/opentelemetry/logs/logger.h.orig	2024-07-17 20:04:10 UTC
>++++ api/include/opentelemetry/logs/logger.h
>+@@ -73,7 +73,7 @@ class Logger (public)
>+     }
>+ 
>+     IgnoreTraitResult(
>+-        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set(
>++        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>(
>+             log_record.get(), std::forward<ArgumentType>(args))...);
>+ 
>+     EmitLogRecord(std::move(log_record));
>diff --git a/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger__type__traits.h b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger__type__traits.h
>new file mode 100644
>index 000000000000..46d4327274a5
>--- /dev/null
>+++ b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger__type__traits.h
>@@ -0,0 +1,11 @@
>+--- api/include/opentelemetry/logs/logger_type_traits.h.orig	2024-07-17 20:04:10 UTC
>++++ api/include/opentelemetry/logs/logger_type_traits.h
>+@@ -166,7 +166,7 @@ struct LogRecordSetterTrait
>+                 * = nullptr>
>+   inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
>+   {
>+-    return LogRecordSetterTrait<common::KeyValueIterable>::template Set(
>++    return LogRecordSetterTrait<common::KeyValueIterable>::template Set<>(
>+         log_record, std::forward<ArgumentType>(arg));
>+   }
>+

Actions: View | Diff

Attachments on bug 281359: 253420