BLI: move generic data structures to blenlib

This is a follow up to rB2252bc6a5527cd7360d1ccfe7a2d1bc640a8dfa6.

3 files changed, 6 insertions, 10 deletions

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 5b41d46443a..e94f8e50fec 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -93,6 +93,10 @@ using blender::CPPType;
 using blender::destruct_ptr;
 using blender::float3;
 using blender::FunctionRef;
+using blender::GMutablePointer;
+using blender::GMutableSpan;
+using blender::GPointer;
+using blender::GVArray;
 using blender::IndexRange;
 using blender::Map;
 using blender::MultiValueMap;
@@ -105,9 +109,6 @@ using blender::Vector;
 using blender::bke::OutputAttribute;
 using blender::fn::Field;
 using blender::fn::GField;
-using blender::fn::GMutablePointer;
-using blender::fn::GPointer;
-using blender::fn::GVArray;
 using blender::fn::ValueOrField;
 using blender::fn::ValueOrFieldCPPType;
 using blender::nodes::FieldInferencingInterface;
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
index 398f7cb3cf8..8e5f9dc429f 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
@@ -11,12 +11,12 @@
 
 #include "FN_field.hh"
 #include "FN_field_cpp_type.hh"
-#include "FN_generic_value_map.hh"
 #include "FN_multi_function.hh"
 
 #include "BLT_translation.h"
 
 #include "BLI_enumerable_thread_specific.hh"
+#include "BLI_generic_value_map.hh"
 #include "BLI_stack.hh"
 #include "BLI_task.h"
 #include "BLI_task.hh"
@@ -28,8 +28,6 @@ namespace blender::modifiers::geometry_nodes {
 
 using fn::Field;
 using fn::GField;
-using fn::GValueMap;
-using fn::GVArray;
 using fn::ValueOrField;
 using fn::ValueOrFieldCPPType;
 using nodes::GeoNodeExecParams;
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.hh b/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
index e981157da41..cbcbcab5679 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
@@ -2,14 +2,13 @@
 
 #pragma once
 
+#include "BLI_generic_pointer.hh"
 #include "BLI_map.hh"
 
 #include "NOD_derived_node_tree.hh"
 #include "NOD_geometry_nodes_eval_log.hh"
 #include "NOD_multi_function.hh"
 
-#include "FN_generic_pointer.hh"
-
 #include "DNA_modifier_types.h"
 
 #include "FN_multi_function.hh"
@@ -19,8 +18,6 @@ namespace geo_log = blender::nodes::geometry_nodes_eval_log;
 namespace blender::modifiers::geometry_nodes {
 
 using namespace nodes::derived_node_tree_types;
-using fn::GMutablePointer;
-using fn::GPointer;
 
 struct GeometryNodesEvaluationParams {
   blender::LinearAllocator<> allocator;