Merge pull request #1457 from malaterre/PointIndexGrid-template-warning

kmuseth · web-flow · commit 849d38e0da9e · 2022-10-10T16:09:29.000-07:00
Remove a simple warning about missing template keyword
diff --git a/openvdb/openvdb/tools/PointIndexGrid.h b/openvdb/openvdb/tools/PointIndexGrid.h
@@ -1427,7 +1427,7 @@ struct PointIndexLeafNode : public tree::LeafNode<T, Log2Dim>
     bool operator!=(const PointIndexLeafNode& other) const { return !(other == *this); }
 
     template<MergePolicy Policy> void merge(const PointIndexLeafNode& rhs) {
-        BaseLeaf::merge<Policy>(rhs);
+        BaseLeaf::template merge<Policy>(rhs);
     }
     template<MergePolicy Policy> void merge(const ValueType& tileValue, bool tileActive) {
          BaseLeaf::template merge<Policy>(tileValue, tileActive);

Original file line number	Diff line number	Diff line change
`@@ -1427,7 +1427,7 @@ struct PointIndexLeafNode : public tree::LeafNode<T, Log2Dim>`
`1427`	`1427`	`bool operator!=(const PointIndexLeafNode& other) const { return !(other == *this); }`
`1428`	`1428`
`1429`	`1429`	`template<MergePolicy Policy> void merge(const PointIndexLeafNode& rhs) {`
`1430`		`- BaseLeaf::merge<Policy>(rhs);`
	`1430`	`+ BaseLeaf::template merge<Policy>(rhs);`
`1431`	`1431`	`}`
`1432`	`1432`	`template<MergePolicy Policy> void merge(const ValueType& tileValue, bool tileActive) {`
`1433`	`1433`	`BaseLeaf::template merge<Policy>(tileValue, tileActive);`