[ci] More CI fixes

ossia · May 30, 2023 · e2e630c · e2e630c
1 parent 992a42a
commit e2e630c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/ossia-max/src/ossia-max.cpp b/src/ossia-max/src/ossia-max.cpp
@@ -35,7 +35,7 @@ using namespace ossia::max_binding;
 void* ossia_max::s_browse_clock;
 ZeroconfOscqueryListener ossia_max::s_zeroconf_oscq_listener;
 ZeroconfMinuitListener ossia_max::s_zeroconf_minuit_listener;
-ossia::fast_hash_map<ossia::net::node_base*, ossia::safe_set<matcher*>>
+ossia::hash_map<ossia::net::node_base*, ossia::safe_set<matcher*>>
     ossia_max::s_node_matchers_map{};
 std::recursive_mutex ossia_max::s_node_matchers_mut;
 t_class* ossia_max::ossia_patcher_listener_class;

diff --git a/src/ossia-max/src/ossia-max.hpp b/src/ossia-max/src/ossia-max.hpp
@@ -224,7 +224,7 @@ class ossia_max
   ossia::safe_vector<client*> clients;
   ossia::safe_vector<logger*> loggers;
 
-  static ossia::fast_hash_map<ossia::net::node_base*, ossia::safe_set<matcher*>>
+  static ossia::hash_map<ossia::net::node_base*, ossia::safe_set<matcher*>>
       s_node_matchers_map;
   static std::recursive_mutex s_node_matchers_mut;
 

diff --git a/src/ossia/dataflow/graph/graph_parallel.hpp b/src/ossia/dataflow/graph/graph_parallel.hpp
@@ -117,7 +117,7 @@ struct parallel_update
 start_node; std::vector<graph_node*> nodes_with_incoming_edges;
 
   tbb::flow::graph flow_graph;
-  ossia::fast_hash_map<graph_node*, std::unique_ptr<cont_node>> flow_nodes;
+  ossia::hash_map<graph_node*, std::unique_ptr<cont_node>> flow_nodes;
   std::vector<graph_node*> start_nodes;
 };
 
@@ -234,7 +234,7 @@ flow_graph.emplace(node_exec_logger_bench{cur_state, *perf_map, *logger,
 
   tf::Taskflow flow_graph;
   tf::Executor executor;
-  ossia::fast_hash_map<graph_node*, tf::Task> flow_nodes;
+  ossia::hash_map<graph_node*, tf::Task> flow_nodes;
 };
 
 struct cpptf_exec

diff --git a/src/ossia/protocols/libmapper/libmapper_protocol.hpp b/src/ossia/protocols/libmapper/libmapper_protocol.hpp
@@ -69,8 +69,8 @@ class OSSIA_EXPORT libmapper_server_protocol final : public ossia::net::protocol
 
   mpr_device m_mapper_dev{};
 
-  ossia::fast_hash_map<const ossia::net::parameter_base*, mpr_signal> m_inputMap;
-  ossia::fast_hash_map<const ossia::net::parameter_base*, mpr_signal> m_outputMap;
+  ossia::hash_map<const ossia::net::parameter_base*, mpr_signal> m_inputMap;
+  ossia::hash_map<const ossia::net::parameter_base*, mpr_signal> m_outputMap;
 
   std::thread m_thread;
   std::atomic_bool m_running{};
@@ -128,7 +128,7 @@ class OSSIA_EXPORT libmapper_client_protocol final : public ossia::net::protocol
   mpr_graph m_db{};
   mpr_device m_mapper_dev{};
 
-  ossia::fast_hash_map<const ossia::net::parameter_base*, mpr_signal> m_inputMap;
-  ossia::fast_hash_map<const ossia::net::parameter_base*, mpr_signal> m_outputMap;
+  ossia::hash_map<const ossia::net::parameter_base*, mpr_signal> m_inputMap;
+  ossia::hash_map<const ossia::net::parameter_base*, mpr_signal> m_outputMap;
 };
 }
diff --git a/src/ossia/protocols/phidgets/phidgets_protocol.hpp b/src/ossia/protocols/phidgets/phidgets_protocol.hpp
@@ -21,7 +21,7 @@ class OSSIA_EXPORT phidget_protocol : public ossia::net::protocol_base
   std::function<void()> m_commandCb;
   moodycamel::ReaderWriterQueue<std::function<void()>> m_functionQueue;
 
-  ossia::fast_hash_map<PhidgetHandle, ossia::phidget_node*> m_phidgetMap;
+  ossia::hash_map<PhidgetHandle, ossia::phidget_node*> m_phidgetMap;
 
 public:
   phidget_protocol();