Skip to content

Commit 31b5c5c

Browse files
lganzzzolganzzzo
committed
Update to the latest oatpp API version
1 parent 3bedb5e commit 31b5c5c

File tree

18 files changed

+38
-38
lines changed

18 files changed

+38
-38
lines changed

‎async-server-rooms/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ add_library(${project_name}-lib
2121

2222
## link libs
2323

24-
find_package(oatpp 0.19.12 REQUIRED)
25-
find_package(oatpp-websocket 0.19.12 REQUIRED)
24+
find_package(oatpp 1.0.0 REQUIRED)
25+
find_package(oatpp-websocket 1.0.0 REQUIRED)
2626

2727
target_link_libraries(${project_name}-lib
2828
PUBLIC oatpp::oatpp

‎async-server-rooms/src/rooms/Peer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ oatpp::async::CoroutineStarter Peer::onPong(const std::shared_ptr<AsyncWebSocket
4949
return nullptr; // do nothing
5050
}
5151

52-
oatpp::async::CoroutineStarter Peer::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) {
52+
oatpp::async::CoroutineStarter Peer::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) {
5353
return nullptr; // do nothing
5454
}
5555

56-
oatpp::async::CoroutineStarter Peer::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
56+
oatpp::async::CoroutineStarter Peer::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
5757

5858
if(size == 0) { // message transfer finished
5959

‎async-server-rooms/src/rooms/Peer.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class Peer : public oatpp::websocket::AsyncWebSocket::Listener {
7676

7777
CoroutineStarter onPing(const std::shared_ptr<AsyncWebSocket>& socket, const oatpp::String& message) override;
7878
CoroutineStarter onPong(const std::shared_ptr<AsyncWebSocket>& socket, const oatpp::String& message) override;
79-
CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) override;
80-
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
79+
CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) override;
80+
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
8181

8282
};
8383

‎async-server/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
1717

1818
## link libs
1919

20-
find_package(oatpp 0.19.12 REQUIRED)
21-
find_package(oatpp-websocket 0.19.12 REQUIRED)
20+
find_package(oatpp 1.0.0 REQUIRED)
21+
find_package(oatpp-websocket 1.0.0 REQUIRED)
2222

2323
target_link_libraries(${project_name}-lib
2424
PUBLIC oatpp::oatpp

‎async-server/src/websocket/WSListener.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ oatpp::async::CoroutineStarter WSListener::onPong(const std::shared_ptr<AsyncWeb
1717
return nullptr; // do nothing
1818
}
1919

20-
oatpp::async::CoroutineStarter WSListener::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) {
20+
oatpp::async::CoroutineStarter WSListener::onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) {
2121
OATPP_LOGD(TAG, "onClose code=%d", code);
2222
return nullptr; // do nothing
2323
}
2424

25-
oatpp::async::CoroutineStarter WSListener::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
25+
oatpp::async::CoroutineStarter WSListener::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
2626

2727
if(size == 0) { // message transfer finished
2828

‎async-server/src/websocket/WSListener.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class WSListener : public oatpp::websocket::AsyncWebSocket::Listener {
3434
/**
3535
* Called on "close" frame
3636
*/
37-
CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_word16 code, const oatpp::String& message) override;
37+
CoroutineStarter onClose(const std::shared_ptr<AsyncWebSocket>& socket, v_uint16 code, const oatpp::String& message) override;
3838

3939
/**
4040
* Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
4141
*/
42-
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
42+
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
4343

4444
};
4545

‎client-binance.com/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ add_library(${project_name}-lib
2020

2121
## link libs
2222

23-
find_package(oatpp 0.19.12 REQUIRED)
24-
find_package(oatpp-websocket 0.19.12 REQUIRED)
25-
find_package(oatpp-mbedtls 0.19.12 REQUIRED)
23+
find_package(oatpp 1.0.0 REQUIRED)
24+
find_package(oatpp-websocket 1.0.0 REQUIRED)
25+
find_package(oatpp-mbedtls 1.0.0 REQUIRED)
2626

2727
target_link_libraries(${project_name}-lib
2828
PUBLIC oatpp::oatpp

‎client-binance.com/src/WSListener.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
1616
OATPP_LOGD(TAG, "onPong");
1717
}
1818

19-
void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
19+
void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
2020
OATPP_LOGD(TAG, "onClose code=%d", code);
2121
}
2222

23-
void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
23+
void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
2424

2525
if(size == 0) { // message transfer finished
2626

‎client-binance.com/src/WSListener.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
3434
/**
3535
* Called on "close" frame
3636
*/
37-
void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
37+
void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
3838

3939
/**
4040
* Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
4141
*/
42-
void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
42+
void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
4343

4444
public:
4545

‎client-mbedtls/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ add_library(${project_name}-lib
1515

1616
## link libs
1717

18-
find_package(oatpp 0.19.12 REQUIRED)
19-
find_package(oatpp-websocket 0.19.12 REQUIRED)
20-
find_package(oatpp-mbedtls 0.19.12 REQUIRED)
18+
find_package(oatpp 1.0.0 REQUIRED)
19+
find_package(oatpp-websocket 1.0.0 REQUIRED)
20+
find_package(oatpp-mbedtls 1.0.0 REQUIRED)
2121

2222
target_link_libraries(${project_name}-lib
2323
PUBLIC oatpp::oatpp

‎client-mbedtls/src/WSListener.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
1717
OATPP_LOGD(TAG, "onPong");
1818
}
1919

20-
void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
20+
void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
2121
OATPP_LOGD(TAG, "onClose code=%d", code);
2222
}
2323

24-
void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
24+
void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
2525

2626
if(size == 0) { // message transfer finished
2727

‎client-mbedtls/src/WSListener.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
3939
/**
4040
* Called on "close" frame
4141
*/
42-
void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
42+
void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
4343

4444
/**
4545
* Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
4646
*/
47-
void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
47+
void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
4848

4949
};
5050

‎client/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ add_library(${project_name}-lib
1515

1616
## link libs
1717

18-
find_package(oatpp 0.19.12 REQUIRED)
19-
find_package(oatpp-websocket 0.19.12 REQUIRED)
18+
find_package(oatpp 1.0.0 REQUIRED)
19+
find_package(oatpp-websocket 1.0.0 REQUIRED)
2020

2121
target_link_libraries(${project_name}-lib
2222
PUBLIC oatpp::oatpp

‎client/src/WSListener.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
1717
OATPP_LOGD(TAG, "onPong");
1818
}
1919

20-
void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
20+
void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
2121
OATPP_LOGD(TAG, "onClose code=%d", code);
2222
}
2323

24-
void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
24+
void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
2525

2626
if(size == 0) { // message transfer finished
2727

‎client/src/WSListener.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
3939
/**
4040
* Called on "close" frame
4141
*/
42-
void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
42+
void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
4343

4444
/**
4545
* Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
4646
*/
47-
void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
47+
void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
4848

4949
};
5050

‎server/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
1717

1818
## link libs
1919

20-
find_package(oatpp 0.19.12 REQUIRED)
21-
find_package(oatpp-websocket 0.19.12 REQUIRED)
20+
find_package(oatpp 1.0.0 REQUIRED)
21+
find_package(oatpp-websocket 1.0.0 REQUIRED)
2222

2323
target_link_libraries(${project_name}-lib
2424
PUBLIC oatpp::oatpp

‎server/src/websocket/WSListener.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ void WSListener::onPong(const WebSocket& socket, const oatpp::String& message) {
1616
OATPP_LOGD(TAG, "onPong");
1717
}
1818

19-
void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) {
19+
void WSListener::onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) {
2020
OATPP_LOGD(TAG, "onClose code=%d", code);
2121
}
2222

23-
void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
23+
void WSListener::readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) {
2424

2525
if(size == 0) { // message transfer finished
2626

‎server/src/websocket/WSListener.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
3434
/**
3535
* Called on "close" frame
3636
*/
37-
void onClose(const WebSocket& socket, v_word16 code, const oatpp::String& message) override;
37+
void onClose(const WebSocket& socket, v_uint16 code, const oatpp::String& message) override;
3838

3939
/**
4040
* Called on each message frame. After the last message will be called once-again with size == 0 to designate end of the message.
4141
*/
42-
void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
42+
void readMessage(const WebSocket& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override;
4343

4444
};
4545

0 commit comments

Comments
 (0)