Skip to content

Commit 3bedb5e

Browse files
lganzzzolganzzzo
committed
Increase oatpp version to 0.19.12
1 parent 2cd5cf9 commit 3bedb5e

File tree

18 files changed

+32
-32
lines changed

18 files changed

+32
-32
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.11 REQUIRED)
25-
find_package(oatpp-websocket 0.19.11 REQUIRED)
24+
find_package(oatpp 0.19.12 REQUIRED)
25+
find_package(oatpp-websocket 0.19.12 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
@@ -53,7 +53,7 @@ oatpp::async::CoroutineStarter Peer::onClose(const std::shared_ptr<AsyncWebSocke
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::data::v_io_size size) {
56+
oatpp::async::CoroutineStarter Peer::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
5757

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

@@ -63,7 +63,7 @@ oatpp::async::CoroutineStarter Peer::readMessage(const std::shared_ptr<AsyncWebS
6363
m_room->sendMessage(m_nickname + ": " + wholeMessage);
6464

6565
} else if(size > 0) { // message frame received
66-
m_messageBuffer.write(data, size);
66+
m_messageBuffer.writeSimple(data, size);
6767
}
6868

6969
return nullptr; // do nothing

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Peer : public oatpp::websocket::AsyncWebSocket::Listener {
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;
7979
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::data::v_io_size size) override;
80+
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 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.11 REQUIRED)
21-
find_package(oatpp-websocket 0.19.11 REQUIRED)
20+
find_package(oatpp 0.19.12 REQUIRED)
21+
find_package(oatpp-websocket 0.19.12 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
@@ -22,7 +22,7 @@ oatpp::async::CoroutineStarter WSListener::onClose(const std::shared_ptr<AsyncWe
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::data::v_io_size size) {
25+
oatpp::async::CoroutineStarter WSListener::readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) {
2626

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

@@ -35,7 +35,7 @@ oatpp::async::CoroutineStarter WSListener::readMessage(const std::shared_ptr<Asy
3535
return socket->sendOneFrameTextAsync( "Hello from oatpp!: " + wholeMessage);
3636

3737
} else if(size > 0) { // message frame received
38-
m_messageBuffer.write(data, size);
38+
m_messageBuffer.writeSimple(data, size);
3939
}
4040

4141
return nullptr; // do nothing

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class WSListener : public oatpp::websocket::AsyncWebSocket::Listener {
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::data::v_io_size size) override;
42+
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_word8 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.11 REQUIRED)
24-
find_package(oatpp-websocket 0.19.11 REQUIRED)
25-
find_package(oatpp-mbedtls 0.19.11 REQUIRED)
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)
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
@@ -20,7 +20,7 @@ void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::St
2020
OATPP_LOGD(TAG, "onClose code=%d", code);
2121
}
2222

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

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

@@ -29,7 +29,7 @@ void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 da
2929
onCompleteMessage(wholeMessage);
3030

3131
} else if(size > 0) { // message frame received
32-
m_messageBuffer.write(data, size);
32+
m_messageBuffer.writeSimple(data, size);
3333
}
3434

3535
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
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::data::v_io_size size) override;
42+
void readMessage(const WebSocket& socket, v_word8 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.11 REQUIRED)
19-
find_package(oatpp-websocket 0.19.11 REQUIRED)
20-
find_package(oatpp-mbedtls 0.19.11 REQUIRED)
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)
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
@@ -21,7 +21,7 @@ void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::St
2121
OATPP_LOGD(TAG, "onClose code=%d", code);
2222
}
2323

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

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

@@ -35,7 +35,7 @@ void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 da
3535
//socket.sendOneFrameText( "Hello from oatpp!: " + wholeMessage);
3636

3737
} else if(size > 0) { // message frame received
38-
m_messageBuffer.write(data, size);
38+
m_messageBuffer.writeSimple(data, size);
3939
}
4040

4141
}

‎client-mbedtls/src/WSListener.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
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::data::v_io_size size) override;
47+
void readMessage(const WebSocket& socket, v_word8 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.11 REQUIRED)
19-
find_package(oatpp-websocket 0.19.11 REQUIRED)
18+
find_package(oatpp 0.19.12 REQUIRED)
19+
find_package(oatpp-websocket 0.19.12 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
@@ -21,7 +21,7 @@ void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::St
2121
OATPP_LOGD(TAG, "onClose code=%d", code);
2222
}
2323

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

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

@@ -35,7 +35,7 @@ void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 da
3535
//socket.sendOneFrameText( "Hello from oatpp!: " + wholeMessage);
3636

3737
} else if(size > 0) { // message frame received
38-
m_messageBuffer.write(data, size);
38+
m_messageBuffer.writeSimple(data, size);
3939
}
4040

4141
}

‎client/src/WSListener.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
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::data::v_io_size size) override;
47+
void readMessage(const WebSocket& socket, v_word8 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.11 REQUIRED)
21-
find_package(oatpp-websocket 0.19.11 REQUIRED)
20+
find_package(oatpp 0.19.12 REQUIRED)
21+
find_package(oatpp-websocket 0.19.12 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
@@ -20,7 +20,7 @@ void WSListener::onClose(const WebSocket& socket, v_word16 code, const oatpp::St
2020
OATPP_LOGD(TAG, "onClose code=%d", code);
2121
}
2222

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

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

@@ -33,7 +33,7 @@ void WSListener::readMessage(const WebSocket& socket, v_word8 opcode, p_char8 da
3333
socket.sendOneFrameText( "Hello from oatpp!: " + wholeMessage);
3434

3535
} else if(size > 0) { // message frame received
36-
m_messageBuffer.write(data, size);
36+
m_messageBuffer.writeSimple(data, size);
3737
}
3838

3939
}

‎server/src/websocket/WSListener.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class WSListener : public oatpp::websocket::WebSocket::Listener {
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::data::v_io_size size) override;
42+
void readMessage(const WebSocket& socket, v_word8 opcode, p_char8 data, oatpp::v_io_size size) override;
4343

4444
};
4545

0 commit comments

Comments
 (0)