Update to the latest oatpp API version

oatpp · Jan 25, 2020 · 31b5c5c · 31b5c5c
1 parent 3bedb5e
commit 31b5c5c
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 38 deletions.
diff --git a/async-server-rooms/CMakeLists.txt b/async-server-rooms/CMakeLists.txt
@@ -21,8 +21,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              0.19.12 REQUIRED)
-find_package(oatpp-websocket    0.19.12 REQUIRED)
+find_package(oatpp              1.0.0 REQUIRED)
+find_package(oatpp-websocket    1.0.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/async-server-rooms/src/rooms/Peer.cpp b/async-server-rooms/src/rooms/Peer.cpp
@@ -49,11 +49,11 @@ oatpp::async::CoroutineStarter Peer::onPong(const std::shared_ptr<AsyncWebSocket
   return nullptr; // do nothing
 }
 
-oatpp::async::CoroutineStarter Peer::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) {
+oatpp::async::CoroutineStarter Peer::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) {
   return nullptr; // do nothing
 }
 
-oatpp::async::CoroutineStarter Peer::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
+oatpp::async::CoroutineStarter Peer::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
 
   if(size == 0) { // message transfer finished
 

diff --git a/async-server-rooms/src/rooms/Peer.hpp b/async-server-rooms/src/rooms/Peer.hpp
@@ -76,8 +76,8 @@ class Peer : public oatpp::websocket::AsyncWebSocket::Listener {
 
   CoroutineStarter onPing(const std::shared_ptr<AsyncWebSocket>& socket, const oatpp::String& message) override;
   CoroutineStarter onPong(const std::shared_ptr<AsyncWebSocket>& socket, const oatpp::String& message) override;
-  CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) override;
-  CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
+  CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) override;
+  CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
 
 };
 

diff --git a/async-server/CMakeLists.txt b/async-server/CMakeLists.txt
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              0.19.12 REQUIRED)
-find_package(oatpp-websocket    0.19.12 REQUIRED)
+find_package(oatpp              1.0.0 REQUIRED)
+find_package(oatpp-websocket    1.0.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/async-server/src/websocket/WSListener.cpp b/async-server/src/websocket/WSListener.cpp
@@ -17,12 +17,12 @@ oatpp::async::CoroutineStarter WSListener::onPong(const std::shared_ptr<AsyncWeb
   return nullptr; // do nothing
 }
 
-oatpp::async::CoroutineStarter WSListener::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) {
+oatpp::async::CoroutineStarter WSListener::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onClose code=%d", code);
   return nullptr; // do nothing
 }
 
-oatpp::async::CoroutineStarter WSListener::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
+oatpp::async::CoroutineStarter WSListener::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
 
   if(size == 0) { // message transfer finished
 

diff --git a/async-server/src/websocket/WSListener.hpp b/async-server/src/websocket/WSListener.hpp
@@ -34,12 +34,12 @@ class WSListener : public oatpp::websocket::AsyncWebSocket::Listener {
   /**
    * Called on "close" frame
    */
-  CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) override;
+  CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) override;
 
   /**
    * Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
    */
-  CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
+  CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
 
 };
 

diff --git a/client-binance.com/CMakeLists.txt b/client-binance.com/CMakeLists.txt
@@ -20,9 +20,9 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              0.19.12 REQUIRED)
-find_package(oatpp-websocket    0.19.12 REQUIRED)
-find_package(oatpp-mbedtls      0.19.12 REQUIRED)
+find_package(oatpp              1.0.0 REQUIRED)
+find_package(oatpp-websocket    1.0.0 REQUIRED)
+find_package(oatpp-mbedtls      1.0.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/client-binance.com/src/WSListener.cpp b/client-binance.com/src/WSListener.cpp
@@ -16,11 +16,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onPong");
 }
 
-void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
+void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onClose code=%d", code);
 }
 
-void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
+void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
 
   if(size == 0) { // message transfer finished
 

diff --git a/client-binance.com/src/WSListener.hpp b/client-binance.com/src/WSListener.hpp
@@ -34,12 +34,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
   /**
    * Called on "close" frame
    */
-  void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
+  void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
 
   /**
    * Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
    */
-  void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
+  void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
 
 public:
 

diff --git a/client-mbedtls/CMakeLists.txt b/client-mbedtls/CMakeLists.txt
@@ -15,9 +15,9 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              0.19.12 REQUIRED)
-find_package(oatpp-websocket    0.19.12 REQUIRED)
-find_package(oatpp-mbedtls      0.19.12 REQUIRED)
+find_package(oatpp              1.0.0 REQUIRED)
+find_package(oatpp-websocket    1.0.0 REQUIRED)
+find_package(oatpp-mbedtls      1.0.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/client-mbedtls/src/WSListener.cpp b/client-mbedtls/src/WSListener.cpp
@@ -17,11 +17,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onPong");
 }
 
-void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
+void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onClose code=%d", code);
 }
 
-void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
+void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
 
   if(size == 0) { // message transfer finished
 

diff --git a/client-mbedtls/src/WSListener.hpp b/client-mbedtls/src/WSListener.hpp
@@ -39,12 +39,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
   /**
    * Called on "close" frame
    */
-  void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
+  void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
 
   /**
    * Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
    */
-  void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
+  void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
 
 };
 

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -15,8 +15,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              0.19.12 REQUIRED)
-find_package(oatpp-websocket    0.19.12 REQUIRED)
+find_package(oatpp              1.0.0 REQUIRED)
+find_package(oatpp-websocket    1.0.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/client/src/WSListener.cpp b/client/src/WSListener.cpp
@@ -17,11 +17,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onPong");
 }
 
-void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
+void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onClose code=%d", code);
 }
 
-void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
+void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
 
   if(size == 0) { // message transfer finished
 

diff --git a/client/src/WSListener.hpp b/client/src/WSListener.hpp
@@ -39,12 +39,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
   /**
    * Called on "close" frame
    */
-  void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
+  void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
 
   /**
    * Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
    */
-  void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
+  void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
 
 };
 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              0.19.12 REQUIRED)
-find_package(oatpp-websocket    0.19.12 REQUIRED)
+find_package(oatpp              1.0.0 REQUIRED)
+find_package(oatpp-websocket    1.0.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/server/src/websocket/WSListener.cpp b/server/src/websocket/WSListener.cpp
@@ -16,11 +16,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onPong");
 }
 
-void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
+void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
   OATPP_LOGD(TAG, "onClose code=%d", code);
 }
 
-void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
+void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
 
   if(size == 0) { // message transfer finished
 

diff --git a/server/src/websocket/WSListener.hpp b/server/src/websocket/WSListener.hpp
@@ -34,12 +34,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
   /**
    * Called on "close" frame
    */
-  void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
+  void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
 
   /**
    * Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
    */
-  void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
+  void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
 
 };