fix rebase mistake

Signed-off-by: vitsai <victoria@anyscale.com>
ray-project · Jul 6, 2023 · 1cb5f26 · 1cb5f26
1 parent 3d9cdc1
commit 1cb5f26
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/ray/object_manager/object_manager.cc b/src/ray/object_manager/object_manager.cc
@@ -100,7 +100,7 @@ ObjectManager::ObjectManager(
       object_manager_server_("ObjectManager",
                              config_.object_manager_port,
                              config_.object_manager_address == "127.0.0.1",
-                             std::future<ClusterID>(),
+                             ClusterID::Nil(),
                              config_.rpc_service_threads_number),
       object_manager_service_(rpc_service_, *this),
       client_call_manager_(

diff --git a/src/ray/rpc/client_call.h b/src/ray/rpc/client_call.h
@@ -195,10 +195,6 @@ class ClientCallManager {
   /// \param[in] main_service The main event loop, to which the callback functions will be
   /// posted.
   ///
-  /// Note: Ideally with C++20 we could use constraints here, or auto&& in the contructor.
-  template <typename T = std::shared_future<ClusterID>,
-            typename = typename std::enable_if_t<
-                std::is_convertible<T, std::shared_future<ClusterID>>::value>>
   explicit ClientCallManager(instrumented_io_context &main_service,
                              const ClusterID &cluster_id = ClusterID::Nil(),
                              int num_threads = 1,