[Bf-blender-cvs] [f9ddfffd6f3] master: Cleanup: compiler warnings
Brecht Van Lommel
noreply at git.blender.org
Wed Jan 4 11:24:50 CET 2023
Commit: f9ddfffd6f323f67066e325205cf16df1a92569c
Author: Brecht Van Lommel
Date: Wed Jan 4 10:37:58 2023 +0100
Branches: master
https://developer.blender.org/rBf9ddfffd6f323f67066e325205cf16df1a92569c
Cleanup: compiler warnings
===================================================================
M build_files/cmake/platform/platform_old_libs_update.cmake
M source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
M source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc
M source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc
M source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
M source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
M source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_face_set_boundaries.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc
M source/blender/nodes/geometry/nodes/node_geo_offset_point_in_curve.cc
M source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc
M source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
===================================================================
diff --git a/build_files/cmake/platform/platform_old_libs_update.cmake b/build_files/cmake/platform/platform_old_libs_update.cmake
index 12ab9a44cf1..ab27dd89385 100644
--- a/build_files/cmake/platform/platform_old_libs_update.cmake
+++ b/build_files/cmake/platform/platform_old_libs_update.cmake
@@ -91,9 +91,10 @@ endif()
if(UNIX AND (NOT APPLE) AND LIBDIR AND (EXISTS ${LIBDIR}))
# Only search for the path if it's found on the system.
- set(LIBDIR_STALE "/lib/linux_centos7_x86_64/")
+ set(_libdir_stale "/lib/linux_centos7_x86_64/")
unset_cached_varables_containting(
- "${LIBDIR_STALE}"
- "Auto clearing old ${LIBDIR_STALE} paths from CMake configuration"
+ "${_libdir_stale}"
+ "Auto clearing old ${_libdir_stale} paths from CMake configuration"
)
+ unset(_libdir_stale)
endif()
diff --git a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
index 174c6c8c509..891ac2614ef 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
@@ -440,7 +440,7 @@ class BlurAttributeFieldInput final : public bke::GeometryFieldInput {
return GVArray::ForGArray(std::move(main_buffer));
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
weight_field_.node().for_each_field_input_recursive(fn);
value_field_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc
index 3b48abfbd7d..7eb958fe576 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc
@@ -77,7 +77,7 @@ class EndpointFieldInput final : public bke::CurvesFieldInput {
return VArray<bool>::ForContainer(std::move(selection));
};
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
start_size_.node().for_each_field_input_recursive(fn);
end_size_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
index ceb5c12fe5d..4ffada76497 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
@@ -101,7 +101,7 @@ class PointsOfCurveInput final : public bke::CurvesFieldInput {
return VArray<int>::ForContainer(std::move(point_of_curve));
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
curve_index_.node().for_each_field_input_recursive(fn);
sort_index_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc
index 5d6d5cb68e5..d9a9b7fdcfe 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc
@@ -92,7 +92,7 @@ class PathToEdgeSelectionFieldInput final : public bke::MeshFieldInput {
VArray<bool>::ForContainer(std::move(selection)), ATTR_DOMAIN_EDGE, domain);
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
start_vertices_.node().for_each_field_input_recursive(fn);
next_vertex_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc
index c3cc07f6edb..05bc57d5ffb 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc
@@ -71,7 +71,7 @@ class HandlePositionFieldInput final : public bke::CurvesFieldInput {
VArray<float3>::ForContainer(std::move(output)), ATTR_DOMAIN_POINT, domain);
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
relative_.node().for_each_field_input_recursive(fn);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
index 859cbf360d4..69b84bcaf45 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
@@ -76,7 +76,7 @@ class PlanarFieldInput final : public bke::MeshFieldInput {
VArray<bool>::ForFunc(polys.size(), planar_fn), ATTR_DOMAIN_FACE, domain);
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
threshold_.node().for_each_field_input_recursive(fn);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc b/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
index d9147d5e3ad..78ec12508b2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
@@ -129,7 +129,7 @@ class ShortestEdgePathsNextVertFieldInput final : public bke::MeshFieldInput {
VArray<int>::ForContainer(std::move(next_index)), ATTR_DOMAIN_POINT, domain);
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
end_selection_.node().for_each_field_input_recursive(fn);
cost_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
index df8b2bbd922..671bf71edf1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
@@ -112,7 +112,7 @@ class InterpolateDomain final : public bke::GeometryFieldInput {
GVArray::ForGArray(std::move(values)), src_domain_, context.domain());
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
src_field_.node().for_each_field_input_recursive(fn);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_set_boundaries.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_set_boundaries.cc
index 23d95e87bae..aedd77b0653 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_set_boundaries.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_set_boundaries.cc
@@ -66,7 +66,7 @@ class BoundaryFieldInput final : public bke::MeshFieldInput {
VArray<bool>::ForContainer(std::move(boundary)), ATTR_DOMAIN_EDGE, domain);
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
face_set_.node().for_each_field_input_recursive(fn);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
index 89374ccecb4..d5b4b4869c1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
@@ -105,7 +105,7 @@ class CornersOfFaceInput final : public bke::MeshFieldInput {
return VArray<int>::ForContainer(std::move(corner_of_face));
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
face_index_.node().for_each_field_input_recursive(fn);
sort_index_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
index 43b26785ec7..12310d6df15 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
@@ -126,7 +126,7 @@ class CornersOfVertInput final : public bke::MeshFieldInput {
return VArray<int>::ForContainer(std::move(corner_of_vertex));
}
- void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
+ void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const override
{
vert_index_.node().for_each_field_input_recursive(fn);
sort_index_.node().for_each_field_input_recursive(fn);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
index 28798484573..b16bbabfe0b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
@@ -126,7 +126,7 @@ class EdgesOfVertInput final : public bke::MeshFieldInput {
return VArray<int>::ForContainer(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list