Merge pull request #38697 from akien-mga/member-init-c++11

Port member default initialization from constructor to declaration (C++11)

2 files changed, 3 insertions, 8 deletions

diff --git a/platform/android/net_socket_android.cpp b/platform/android/net_socket_android.cpp
index 320bdd3817..dc0154ea01 100644
--- a/platform/android/net_socket_android.cpp
+++ b/platform/android/net_socket_android.cpp
@@ -72,11 +72,6 @@ void NetSocketAndroid::make_default() {
 	_create = _create_func;
 }
 
-NetSocketAndroid::NetSocketAndroid() :
-		wants_broadcast(false),
-		multicast_groups(0) {
-}
-
 NetSocketAndroid::~NetSocketAndroid() {
 	close();
 }
diff --git a/platform/android/net_socket_android.h b/platform/android/net_socket_android.h
index 4fc80d2de1..7d6267e8b3 100644
--- a/platform/android/net_socket_android.h
+++ b/platform/android/net_socket_android.h
@@ -52,8 +52,8 @@ private:
 	static jmethodID _multicast_lock_acquire;
 	static jmethodID _multicast_lock_release;
 
-	bool wants_broadcast;
-	int multicast_groups;
+	bool wants_broadcast = false;
+	int multicast_groups = 0;
 
 	static void multicast_lock_acquire();
 	static void multicast_lock_release();
@@ -71,7 +71,7 @@ public:
 	virtual Error join_multicast_group(const IP_Address &p_multi_address, String p_if_name);
 	virtual Error leave_multicast_group(const IP_Address &p_multi_address, String p_if_name);
 
-	NetSocketAndroid();
+	NetSocketAndroid() {}
 	~NetSocketAndroid();
 };