From 4dc6727cb525f1252c5483cf80a691fd5bbeb49d Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 24 Nov 2024 17:52:16 +0100 Subject: [PATCH] math/dgl: 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/math/dgl/work/dgl-1.1.2/third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h:241:30: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 241 | index_ = value_.template Construct(std::forward(args)...); | ^ /wrkdirs/usr/ports/math/dgl/work/dgl-1.1.2/third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h:258:26: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 258 | if (!value_.template Assign(TypeTag{}, index_, std::forward(value))) { | ^ /wrkdirs/usr/ports/math/dgl/work/dgl-1.1.2/third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h:265:26: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 265 | if (!value_.template Assign(index_, std::forward(value))) { | ^ In all these cases, appending "<>" is enough to satisfy the constraint. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 PR: 282949 Approved by: maintainer timeout (2 weeks) MFH: 2024Q4 --- ...__party_libnop_include_nop_types_variant.h | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h diff --git a/math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h b/math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h new file mode 100644 index 000000000000..004e29c616b6 --- /dev/null +++ b/math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h @@ -0,0 +1,28 @@ +--- third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h.orig 2020-07-24 02:13:02 UTC ++++ third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h +@@ -238,7 +238,7 @@ class Variant { + // resulting type. + template + void Construct(Args&&... args) { +- index_ = value_.template Construct(std::forward(args)...); ++ index_ = value_.template Construct<>(std::forward(args)...); + } + void Construct(EmptyVariant) {} + +@@ -255,14 +255,14 @@ class Variant { + // multiple element types. + template + void Assign(TypeTag, U&& value) { +- if (!value_.template Assign(TypeTag{}, index_, std::forward(value))) { ++ if (!value_.template Assign<>(TypeTag{}, index_, std::forward(value))) { + Destruct(); + Construct(TypeTag{}, std::forward(value)); + } + } + template + void Assign(T&& value) { +- if (!value_.template Assign(index_, std::forward(value))) { ++ if (!value_.template Assign<>(index_, std::forward(value))) { + Destruct(); + Construct(std::forward(value)); + }