Skip to content

Commit b62fdae

Browse files
authored
Merge pull request #12685 from kivaisan/remove_deprecated_netsocket_methods
Remove deprecated netsocket methods
2 parents fff2342 + 619a5a7 commit b62fdae

File tree

4 files changed

+0
-68
lines changed

4 files changed

+0
-68
lines changed

features/netsocket/InternetSocket.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,6 @@ void InternetSocket::sigio(Callback<void()> callback)
205205
core_util_critical_section_exit();
206206
}
207207

208-
void InternetSocket::attach(Callback<void()> callback)
209-
{
210-
sigio(callback);
211-
}
212-
213208
nsapi_error_t InternetSocket::getpeername(SocketAddress *address)
214209
{
215210
if (!_socket) {

features/netsocket/InternetSocket.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -124,33 +124,6 @@ class InternetSocket : public Socket {
124124
*/
125125
nsapi_error_t getpeername(SocketAddress *address) override;
126126

127-
/** Register a callback on state change of the socket.
128-
*
129-
* @see Socket::sigio
130-
* @deprecated
131-
* The behavior of Socket::attach differs from other attach functions in
132-
* Mbed OS and has been known to cause confusion. Replaced by Socket::sigio.
133-
*/
134-
MBED_DEPRECATED_SINCE("mbed-os-5.4",
135-
"The behavior of Socket::attach differs from other attach functions in "
136-
"Mbed OS and has been known to cause confusion. Replaced by Socket::sigio.")
137-
void attach(mbed::Callback<void()> func);
138-
139-
/** Register a callback on state change of the socket.
140-
*
141-
* @see Socket::sigio
142-
* @deprecated
143-
* The attach function does not support cv-qualifiers. Replaced by
144-
* attach(callback(obj, method)).
145-
*/
146-
template <typename T, typename M>
147-
MBED_DEPRECATED_SINCE("mbed-os-5.1",
148-
"The attach function does not support cv-qualifiers. Replaced by "
149-
"attach(callback(obj, method)).")
150-
void attach(T *obj, M method)
151-
{
152-
attach(mbed::callback(obj, method));
153-
}
154127

155128
#if !defined(DOXYGEN_ONLY)
156129

features/netsocket/TCPSocket.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,6 @@ class TCPSocket : public InternetSocket {
3737
*/
3838
TCPSocket();
3939

40-
/** Create a socket on a network interface
41-
*
42-
* Creates and opens a socket on the network stack of the given
43-
* network interface.
44-
*
45-
* @param stack Network stack as target for socket
46-
*
47-
* @deprecated since mbed-os-5.11
48-
*/
49-
template <typename S>
50-
MBED_DEPRECATED_SINCE("mbed-os-5.11",
51-
"The TCPSocket(S *stack) constructor is deprecated."
52-
"It discards the open() call return value."
53-
"Use another constructor and call open() explicitly, instead.")
54-
TCPSocket(S *stack) : TCPSocket()
55-
{
56-
open(stack);
57-
}
58-
5940
/** Override multicast functions to return error for TCP
6041
*
6142
*/

features/netsocket/UDPSocket.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,6 @@ class UDPSocket : public InternetDatagramSocket {
3838
*/
3939
UDPSocket();
4040

41-
/** Create and open a socket on the network stack of the given
42-
* network interface.
43-
*
44-
* @tparam S Type of the Network stack.
45-
* @param stack Network stack as target for socket.
46-
* @deprecated since mbed-os-5.11
47-
*/
48-
template <typename S>
49-
MBED_DEPRECATED_SINCE("mbed-os-5.11",
50-
"The UDPSocket(S *stack) constructor is deprecated"
51-
"It discards the open() call return value."
52-
"Use another constructor and call open() explicitly, instead.")
53-
UDPSocket(S *stack) : UDPSocket()
54-
{
55-
open(stack);
56-
}
57-
5841
#if !defined(DOXYGEN_ONLY)
5942

6043
protected:

0 commit comments

Comments
 (0)