Removed deprecated xjson.hpp

marimeireles · Sep 10, 2021 · 17e6307 · 17e6307
1 parent 74d1885
commit 17e6307
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,7 +129,6 @@ set(XEUS_HEADERS
     ${XEUS_INCLUDE_DIR}/xeus/xhistory_manager.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xinput.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xinterpreter.hpp
-    ${XEUS_INCLUDE_DIR}/xeus/xjson.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xkernel.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xkernel_configuration.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xlogger.hpp

diff --git a/example/src/main.cpp b/example/src/main.cpp
@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
     interpreter_ptr interpreter = interpreter_ptr(new custom::custom_interpreter());
 
     // Create kernel instance and start it
-    xeus::xkernel kernel(config, xeus::get_user_name(), std::move(interpreter), make_xserver);
+    xeus::xkernel kernel(config, xeus::get_user_name(), std::move(interpreter), xeus::make_xserver_zmq);
     kernel.start();
 
     return 0;

diff --git a/include/xeus/xjson.hpp b/include/xeus/xjson.hpp
diff --git a/include/xeus/xserver_zmq.hpp b/include/xeus/xserver_zmq.hpp
@@ -78,9 +78,9 @@ namespace xeus
     };
 
     XEUS_API
-    std::unique_ptr<xserver> make_xserver(zmq::context_t& context,
-                                          const xconfiguration& config,
-                                          nl::json::error_handler_t eh = nl::json::error_handler_t::strict);
+    std::unique_ptr<xserver> make_xserver_zmq(zmq::context_t& context,
+                                              const xconfiguration& config,
+                                              nl::json::error_handler_t eh = nl::json::error_handler_t::strict);
 }
 
 #endif
diff --git a/src/xserver_zmq.cpp b/src/xserver_zmq.cpp
@@ -209,9 +209,9 @@ namespace xeus
         (void)m_heartbeat_controller.recv(response);
     }
 
-    std::unique_ptr<xserver> make_xserver(zmq::context_t& context,
-                                          const xconfiguration& config,
-                                          nl::json::error_handler_t eh)
+    std::unique_ptr<xserver> make_xserver_zmq(zmq::context_t& context,
+                                              const xconfiguration& config,
+                                              nl::json::error_handler_t eh)
     {
         return std::make_unique<xserver_zmq>(context, config, eh);
     }

diff --git a/test/main.cpp b/test/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char* argv[])
 
     using interpreter_ptr = std::unique_ptr<test_kernel::test_interpreter>;
     interpreter_ptr interpreter = interpreter_ptr(new test_kernel::test_interpreter());
-    xeus::xkernel kernel(config, xeus::get_user_name(), std::move(interpreter), xeus::make_xserver);
+    xeus::xkernel kernel(config, xeus::get_user_name(), std::move(interpreter), xeus::make_xserver_zmq);
     std::cout << "starting kernel" << std::endl;
     kernel.start();