From nobody Sun Sep 08 17:46:40 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1y806qGzz5VYjN; Sun, 08 Sep 2024 17:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X1y806BvBz4hK9; Sun, 8 Sep 2024 17:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725817600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3kXdAPcj2Q9uSz2j2OuWtcMZLx2+8Fr0jfRo51iUgs=; b=C+0IkghJQZfSHv0lgipYzhHYWFDrc5LocP9txLKr0aaP5bbilYc6DAqjzouHockwGctzKw Px14kH6a9qNdLkdzji7D75Xr5rIm0vpDYMF9CpAjJaQdestPStKikWXZYtBGno2zHWzHc5 k4tuGpWi7D9BFoAtMGaEihL1oL0Rn5pJZFYh3ywkm1GeehTyAaVPO2taF47ADxM6vtCaGb 03NFVLP2GkmZi6Sww2CnuBFrYJqdNFmPLbD27E9vK2FkbKBlPAYoNPC9MmaBLn8LG4jj7W 1NbLrrEsqIUnZ3paMqddcOIXSu169Y2J/HmYXmXwa1lekaUpHrT8o1sh43k3xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725817600; a=rsa-sha256; cv=none; b=Jif/eVzj4j5witfX6iqeOJd+weTLYacFcl52o+D5kDECe50lTLMWvDwg4W/M+WWwGqhry7 ta5jv0ABnfNz9cprt1sDm1F9T4pWL+SXXDM/GkZCg+ogeelaQRxzGPfbP413JpwhoAymHC 5UbLsnsqygKFOrdx/kRRjl3iOCaOdZ1rSCHw7jh1WlKLyvMsfjyhcVN3/R6lh2HS7bDBR3 9T/JKtc8MM5W5r0jaKvKyGQOiWiLTk89cGKZz7ePFb7lR+8VOy+dI2QIk9tmENrIrG/SR8 P9FnAuVTcPOO643vvRRDtO+oRhD4EmHcWLMW8AR7UmyOwbHENpQrRxFcMb7grA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725817600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3kXdAPcj2Q9uSz2j2OuWtcMZLx2+8Fr0jfRo51iUgs=; b=oxhiQnncY/vTGdHqQJFgBa3urJSgvXmXCZvz9GDBSJUrOm+KG2Qo7S5ke58z5e6oYWfSNU re2xpEJA8AsRTeUsx/Di75d4485jpZyNSII0YrZI0aLigmWZPienWKMJsOUXSCgxMmZZmT v6sHbYyM11PNRkfRHxcIM+hegah+jWRY8UHTGMZ2+fM8wOavagZO8nEuN1DOXD1NiuhPRh R11gBcD2lA3S2o2yQOD9UudH13cFN6hMgv6lNAqvvhNZA7vgmX5U5U0RVXJoRC8t2Hj+CR G1SGFb1N5MoyT+DAT/OZ5pD3+j8xYeMds2zpLx+f1sYaPW0ZLAyLAM+qNkTvfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X1y805ZgtzSgd; Sun, 8 Sep 2024 17:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488Hkeqk025901; Sun, 8 Sep 2024 17:46:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488HkeSl025898; Sun, 8 Sep 2024 17:46:40 GMT (envelope-from git) Date: Sun, 8 Sep 2024 17:46:40 GMT Message-Id: <202409081746.488HkeSl025898@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 676864fd474b - main - devel/opentelemetry-cpp: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 676864fd474bdd6ec1d74496d0a58d9a5a046601 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=676864fd474bdd6ec1d74496d0a58d9a5a046601 commit 676864fd474bdd6ec1d74496d0a58d9a5a046601 Author: Dimitry Andric AuthorDate: 2024-09-08 09:20:21 +0000 Commit: Dimitry Andric CommitDate: 2024-09-08 17:45:19 +0000 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::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::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::type>::template Set( | ^ In these cases, appending "<>" is enough to satisfy the constraint. PR: 281359 Approved by: osa (maintainer) MFH: 2024Q3 --- .../patch-api_include_opentelemetry_logs_event__logger.h | 11 +++++++++++ .../files/patch-api_include_opentelemetry_logs_logger.h | 11 +++++++++++ ...atch-api_include_opentelemetry_logs_logger__type__traits.h | 11 +++++++++++ 3 files changed, 33 insertions(+) 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 log_record = delegate_logger->CreateLogRecord(); + + IgnoreTraitResult( +- detail::LogRecordSetterTrait::type>::template Set( ++ detail::LogRecordSetterTrait::type>::template Set<>( + log_record.get(), std::forward(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::type>::template Set( ++ detail::LogRecordSetterTrait::type>::template Set<>( + log_record.get(), std::forward(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::template Set( ++ return LogRecordSetterTrait::template Set<>( + log_record, std::forward(arg)); + } +