summaryrefslogtreecommitdiffstats
path: root/platform/android/net_socket_android.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-05-06 08:36:30 +0200
committerGitHub <noreply@github.com>2021-05-06 08:36:30 +0200
commit42b07f713fcbf9228dbc9145a07f706285a17a5f (patch)
treed43c43f71d524839293dc58a756c3f561ee2646b /platform/android/net_socket_android.cpp
parent4fee363d7df235d2b9275240a87474d9bd0de541 (diff)
parent3f078c99f6be160641b1c4782d2653b9d76a5ca8 (diff)
downloadredot-engine-42b07f713fcbf9228dbc9145a07f706285a17a5f.tar.gz
Merge pull request #37700 from Calinou/rename-ip-unix-tcp-server
Rename `IP_Unix`, `IP_Address` and `TCP_Server` to remove underscores
Diffstat (limited to 'platform/android/net_socket_android.cpp')
-rw-r--r--platform/android/net_socket_android.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/net_socket_android.cpp b/platform/android/net_socket_android.cpp
index ddc2368793..dbd1870ee6 100644
--- a/platform/android/net_socket_android.cpp
+++ b/platform/android/net_socket_android.cpp
@@ -103,7 +103,7 @@ Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) {
return OK;
}
-Error NetSocketAndroid::join_multicast_group(const IP_Address &p_multi_address, String p_if_name) {
+Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, String p_if_name) {
Error err = NetSocketPosix::join_multicast_group(p_multi_address, p_if_name);
if (err != OK)
return err;
@@ -115,7 +115,7 @@ Error NetSocketAndroid::join_multicast_group(const IP_Address &p_multi_address,
return OK;
}
-Error NetSocketAndroid::leave_multicast_group(const IP_Address &p_multi_address, String p_if_name) {
+Error NetSocketAndroid::leave_multicast_group(const IPAddress &p_multi_address, String p_if_name) {
Error err = NetSocketPosix::leave_multicast_group(p_multi_address, p_if_name);
if (err != OK)
return err;