Merge pull request #22653 from neikeq/mono-mod-fix-gcc-warnings

Fix GCC compiler warning in mono module

2 files changed, 14 insertions, 8 deletions

diff --git a/modules/mono/utils/mono_reg_utils.cpp b/modules/mono/utils/mono_reg_utils.cpp
index 8116df5f51..6bb6efa92a 100644
--- a/modules/mono/utils/mono_reg_utils.cpp
+++ b/modules/mono/utils/mono_reg_utils.cpp
@@ -228,4 +228,4 @@ cleanup:
 }
 } // namespace MonoRegUtils
 
-#endif WINDOWS_ENABLED
+#endif // WINDOWS_ENABLED
diff --git a/modules/mono/utils/thread_local.h b/modules/mono/utils/thread_local.h
index 84dae1d86b..d7d98c47e2 100644
--- a/modules/mono/utils/thread_local.h
+++ b/modules/mono/utils/thread_local.h
@@ -108,17 +108,23 @@ class ThreadLocal {
 		return data;
 	}
 
+	void _initialize(const T &p_init_val) {
+		init_val = p_init_val;
+		storage.alloc(&destr_callback);
+	}
+
 public:
-	ThreadLocal() :
-			ThreadLocal(T()) {}
+	ThreadLocal() {
+		_initialize(T());
+	}
 
-	ThreadLocal(const T &p_init_val) :
-			init_val(p_init_val) {
-		storage.alloc(&destr_callback);
+	ThreadLocal(const T &p_init_val) {
+		_initialize(p_init_val);
 	}
 
-	ThreadLocal(const ThreadLocal &other) :
-			ThreadLocal(*other._tls_get_value()) {}
+	ThreadLocal(const ThreadLocal &other) {
+		_initialize(*other._tls_get_value());
+	}
 
 	~ThreadLocal() {
 		storage.free();