Change interface return type

fantasy-peak · Apr 17, 2024 · 1286a3a · 1286a3a
1 parent 3b061b9
commit 1286a3a
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 39 deletions.
diff --git a/out/bi_web/include/frpc.hpp b/out/bi_web/include/frpc.hpp
@@ -448,11 +448,11 @@ class BiChannel final {
     }
 
     auto& socket() {
-        return *m_socket_ptr;
+        return m_socket_ptr;
     }
 
     auto& context() {
-        return *m_context_ptr;
+        return m_context_ptr;
     }
 
 private:
@@ -572,11 +572,11 @@ struct UniChannel final {
     }
 
     auto& context() {
-        return *m_context_ptr;
+        return m_context_ptr;
     }
 
     auto& socket() {
-        return *m_socket_ptr;
+        return m_socket_ptr;
     }
 
 private:
@@ -751,11 +751,11 @@ class HelloWorldClient final {
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -1179,11 +1179,11 @@ class HelloWorldReceiver final {
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -1452,11 +1452,11 @@ class StreamClient final {
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -1621,11 +1621,11 @@ class StreamServer final {
             m_pool_ptr->stop();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 

diff --git a/out/frpc.hpp b/out/frpc.hpp
@@ -448,11 +448,11 @@ class BiChannel final {
     }
 
     auto& socket() {
-        return *m_socket_ptr;
+        return m_socket_ptr;
     }
 
     auto& context() {
-        return *m_context_ptr;
+        return m_context_ptr;
     }
 
 private:
@@ -572,11 +572,11 @@ struct UniChannel final {
     }
 
     auto& context() {
-        return *m_context_ptr;
+        return m_context_ptr;
     }
 
     auto& socket() {
-        return *m_socket_ptr;
+        return m_socket_ptr;
     }
 
 private:
@@ -751,11 +751,11 @@ class HelloWorldClient final {
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -1179,11 +1179,11 @@ class HelloWorldReceiver final {
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -1452,11 +1452,11 @@ class StreamClient final {
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -1621,11 +1621,11 @@ class StreamServer final {
             m_pool_ptr->stop();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 

diff --git a/template/cpp/bi.inja b/template/cpp/bi.inja
@@ -38,11 +38,11 @@ public:
             m_channel->start();
         }
 
-        auto& socket() {
+        decltype(auto) socket() {
             return m_channel->socket();
         }
 
-        auto& context() {
+        decltype(auto) context() {
             return m_channel->context();
         }
 

diff --git a/template/cpp/bi_channel.inja b/template/cpp/bi_channel.inja
@@ -117,11 +117,11 @@ public:
     }
 
     auto& socket() {
-        return *m_socket_ptr;
+        return m_socket_ptr;
     }
 
     auto& context() {
-        return *m_context_ptr;
+        return m_context_ptr;
     }
 
 private:

diff --git a/template/cpp/bi_stream.inja b/template/cpp/bi_stream.inja
@@ -59,11 +59,11 @@ public:
         m_channel->start();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 
@@ -230,11 +230,11 @@ public:
             m_pool_ptr->stop();
     }
 
-    auto& socket() {
+    decltype(auto) socket() {
         return m_channel->socket();
     }
 
-    auto& context() {
+    decltype(auto) context() {
         return m_channel->context();
     }
 

diff --git a/template/cpp/uni.inja b/template/cpp/uni.inja
@@ -98,11 +98,11 @@ public:
             m_channel->start();
         }
 
-        auto& socket() {
+        decltype(auto) socket() {
             return m_channel->socket();
         }
 
-        auto& context() {
+        decltype(auto) context() {
             return m_channel->context();
         }
 

diff --git a/template/cpp/uni_channel.inja b/template/cpp/uni_channel.inja
@@ -62,11 +62,11 @@ public:
     }
 
     auto& context() {
-        return *m_context_ptr;
+        return m_context_ptr;
     }
 
     auto& socket() {
-        return *m_socket_ptr;
+        return m_socket_ptr;
     }
 
 private:

diff --git a/test/cpp/bi.cpp b/test/cpp/bi.cpp
@@ -48,7 +48,7 @@ void start_server() {
         [](std::string error) {
             spdlog::error("frpc::HelloWorldServer error: {}", error);
         });
-    auto monitor = std::make_unique<frpc::Monitor>(server->context(), server->socket());
+    auto monitor = std::make_unique<frpc::Monitor>(*(server->context()), *(server->socket()));
     auto event_cb = [](std::optional<std::tuple<zmq_event_t, std::string>> data) {
         if (!data.has_value())
             return;

diff --git a/test/cpp/uni_pub_sub.cpp b/test/cpp/uni_pub_sub.cpp
@@ -2,6 +2,7 @@
 #include <string>
 
 #include <spdlog/spdlog.h>
+#include <zmq.h>
 
 #include "frpc.hpp"
 
@@ -73,14 +74,14 @@ int main() {
         [](auto error) {
             spdlog::error("{}", error);
         });
-    auto monitor = std::make_unique<frpc::Monitor>(receiver->context(), receiver->socket());
+    auto monitor = std::make_unique<frpc::Monitor>(*(receiver->context()), *(receiver->socket()));
     auto event_cb = [](std::optional<std::tuple<zmq_event_t, std::string>> data) {
         if (!data.has_value())
             return;
         auto& [event, point] = data.value();
         spdlog::info("HelloWorldReceiver monitor: {} {}", frpc::getEventName(event.event), point);
     };
-    monitor->start(event_cb, ZMQ_EVENT_ACCEPTED | ZMQ_EVENT_DISCONNECTED);
+    monitor->start(event_cb, ZMQ_EVENT_CONNECTED| ZMQ_EVENT_DISCONNECTED);
     receiver->start();
 
     std::this_thread::sleep_for(std::chrono::seconds(10));