Attachment 253488 Details for Bug 281418 – misc/openvdb: fix build with clang 19

[patch] misc/openvdb: fix build with clang 19

misc__openvdb-fix-clang19-build-1.diff (text/plain), 2.96 KB, created by Dimitry Andric on 2024-09-10 14:26:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-09-10 14:26:21 UTC

Size: 2.96 KB

patch

obsolete

>commit b030c7be4e80d80006b09a6044418fa72582344a
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-09-10T16:24:56+02:00
>
>    misc/openvdb: 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/misc/openvdb/work/openvdb-11.0.0/openvdb/openvdb/../openvdb/tree/NodeManager.h:330:31: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
>          330 |                 OpT::template eval(mNodeOp, it);
>              |                               ^
>        /wrkdirs/usr/ports/misc/openvdb/work/openvdb-11.0.0/openvdb/openvdb/../openvdb/tree/NodeManager.h:350:31: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
>          350 |                 OpT::template eval(mNodeOp, it);
>              |                               ^
>        /wrkdirs/usr/ports/misc/openvdb/work/openvdb-11.0.0/openvdb/openvdb/../openvdb/tree/NodeManager.h:375:31: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
>          375 |                 OpT::template eval(*mNodeOp, it);
>              |                               ^
>    
>    In these cases, appending "<>" is enough to satisfy the constraint.
>    
>    PR:             281418
>    MFH:            2024Q3
>
>diff --git a/misc/openvdb/files/patch-openvdb_openvdb_tree_NodeManager.h b/misc/openvdb/files/patch-openvdb_openvdb_tree_NodeManager.h
>new file mode 100644
>index 000000000000..e87fe2c85273
>--- /dev/null
>+++ b/misc/openvdb/files/patch-openvdb_openvdb_tree_NodeManager.h
>@@ -0,0 +1,29 @@
>+--- openvdb/openvdb/tree/NodeManager.h.orig	2023-11-01 20:31:11 UTC
>++++ openvdb/openvdb/tree/NodeManager.h
>+@@ -327,7 +327,7 @@ class NodeList (private)
>+         void operator()(const NodeRange& range) const
>+         {
>+             for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
>+-                OpT::template eval(mNodeOp, it);
>++                OpT::template eval<>(mNodeOp, it);
>+             }
>+         }
>+         const NodeOp mNodeOp;
>+@@ -347,7 +347,7 @@ class NodeList (private)
>+         void operator()(const NodeRange& range) const
>+         {
>+             for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
>+-                OpT::template eval(mNodeOp, it);
>++                OpT::template eval<>(mNodeOp, it);
>+             }
>+         }
>+         const NodeOp& mNodeOp;
>+@@ -372,7 +372,7 @@ class NodeList (private)
>+         void operator()(const NodeRange& range)
>+         {
>+             for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
>+-                OpT::template eval(*mNodeOp, it);
>++                OpT::template eval<>(*mNodeOp, it);
>+             }
>+         }
>+         void join(const NodeReducer& other)

Actions: View | Diff

Attachments on bug 281418: 253488