From 35d21c08813242002e31f1d9bbc45fed5a21ebde Mon Sep 17 00:00:00 2001
From: Marcelo Fernandez <marcelofg55@gmail.com>
Date: Thu, 22 Mar 2018 00:17:18 -0300
Subject: [PATCH] Fix several in-class initialization clang warning

---
 core/command_queue_mt.cpp | 1 +
 core/command_queue_mt.h   | 6 +++---
 core/reference.h          | 5 ++---
 core/string_buffer.h      | 6 +++++-
 core/string_builder.h     | 6 +++++-
 platform/osx/os_osx.h     | 2 +-
 platform/osx/os_osx.mm    | 1 +
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/command_queue_mt.cpp b/core/command_queue_mt.cpp
index 6bb313575753..a39c920dfaa9 100644
--- a/core/command_queue_mt.cpp
+++ b/core/command_queue_mt.cpp
@@ -105,6 +105,7 @@ CommandQueueMT::CommandQueueMT(bool p_sync) {
 
 	read_ptr = 0;
 	write_ptr = 0;
+	dealloc_ptr = 0;
 	mutex = Mutex::create();
 
 	for (int i = 0; i < SYNC_SEMAPHORES; i++) {
diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h
index c1439bdc4c7a..3942b961d3a7 100644
--- a/core/command_queue_mt.h
+++ b/core/command_queue_mt.h
@@ -309,9 +309,9 @@ class CommandQueueMT {
 	};
 
 	uint8_t command_mem[COMMAND_MEM_SIZE];
-	uint32_t read_ptr = 0;
-	uint32_t write_ptr = 0;
-	uint32_t dealloc_ptr = 0;
+	uint32_t read_ptr;
+	uint32_t write_ptr;
+	uint32_t dealloc_ptr;
 	SyncSemaphore sync_sems[SYNC_SEMAPHORES];
 	Mutex *mutex;
 	Semaphore *sync;
diff --git a/core/reference.h b/core/reference.h
index a0bdb6225867..0d6b1ced6ead 100644
--- a/core/reference.h
+++ b/core/reference.h
@@ -63,7 +63,7 @@ public:
 template <class T>
 class Ref {
 
-	T *reference = NULL;
+	T *reference;
 
 	void ref(const Ref &p_from) {
 
@@ -213,10 +213,9 @@ public:
 
 	Ref(T *p_reference) {
 
+		reference = NULL;
 		if (p_reference)
 			ref_pointer(p_reference);
-		else
-			reference = NULL;
 	}
 
 	Ref(const Variant &p_variant) {
diff --git a/core/string_buffer.h b/core/string_buffer.h
index b148e4554489..7e9b151bea04 100644
--- a/core/string_buffer.h
+++ b/core/string_buffer.h
@@ -39,7 +39,7 @@ class StringBuffer {
 
 	CharType short_buffer[SHORT_BUFFER_SIZE];
 	String buffer;
-	int string_length = 0;
+	int string_length;
 
 	_FORCE_INLINE_ CharType *current_buffer_ptr() {
 		return static_cast<Vector<CharType> &>(buffer).empty() ? short_buffer : buffer.ptrw();
@@ -79,6 +79,10 @@ public:
 	_FORCE_INLINE_ operator String() {
 		return as_string();
 	}
+
+	StringBuffer() {
+		string_length = 0;
+	}
 };
 
 template <int SHORT_BUFFER_SIZE>
diff --git a/core/string_builder.h b/core/string_builder.h
index 9e2599ac3279..596b3bf73061 100644
--- a/core/string_builder.h
+++ b/core/string_builder.h
@@ -37,7 +37,7 @@
 
 class StringBuilder {
 
-	uint32_t string_length = 0;
+	uint32_t string_length;
 
 	Vector<String> strings;
 	Vector<const char *> c_strings;
@@ -75,6 +75,10 @@ public:
 	_FORCE_INLINE_ operator String() const {
 		return as_string();
 	}
+
+	StringBuilder() {
+		string_length = 0;
+	}
 };
 
 #endif // STRING_BUILDER_H
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 29935f197e68..72ca8969d049 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -100,7 +100,7 @@ public:
 	id context;
 
 	CursorShape cursor_shape;
-	NSCursor *cursors[CURSOR_MAX] = { NULL };
+	NSCursor *cursors[CURSOR_MAX];
 	MouseMode mouse_mode;
 
 	String title;
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index d125ca5a67f2..56a6b5de2368 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -2369,6 +2369,7 @@ OS_OSX *OS_OSX::singleton = NULL;
 
 OS_OSX::OS_OSX() {
 
+	memset(cursors, 0, sizeof(cursors));
 	key_event_pos = 0;
 	mouse_mode = OS::MOUSE_MODE_VISIBLE;
 	main_loop = NULL;