[Scummvm-git-logs] scummvm master -> f8ff774b8d28254db5159f6df979804b4a24597d

[lephilousophe]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f8ff774b8d COMMON: Fix clang build


Commit: f8ff774b8d28254db5159f6df979804b4a24597d
    https://github.com/scummvm/scummvm/commit/f8ff774b8d28254db5159f6df979804b4a24597d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-02-07T11:38:46+01:00

Commit Message:
COMMON: Fix clang build

In C++11 standard, nullptr_t is defined in std and not in global space

Changed paths:
    common/ptr.h


diff --git a/common/ptr.h b/common/ptr.h
index 415da83eaf..1357604d95 100644
--- a/common/ptr.h
+++ b/common/ptr.h
@@ -27,6 +27,10 @@
 #include "common/noncopyable.h"
 #include "common/safe-bool.h"
 #include "common/types.h"
+#ifdef USE_CXX11
+/* For nullptr_t */
+#include <cstddef>
+#endif
 
 namespace Common {
 
@@ -86,7 +90,7 @@ public:
 	}
 
 #ifdef USE_CXX11
-	explicit BasePtr(nullptr_t) : _refCount(nullptr), _deletion(nullptr), _pointer(nullptr) {
+	explicit BasePtr(std::nullptr_t) : _refCount(nullptr), _deletion(nullptr), _pointer(nullptr) {
 	}
 #endif
 
@@ -283,7 +287,7 @@ public:
 	}
 
 #ifdef USE_CXX11
-	SharedPtr(nullptr_t) : BasePtr<T>() {
+	SharedPtr(std::nullptr_t) : BasePtr<T>() {
 	}
 #endif
 
@@ -349,7 +353,7 @@ public:
 	}
 
 #ifdef USE_CXX11
-	WeakPtr(nullptr_t) : BasePtr<T>() {
+	WeakPtr(std::nullptr_t) : BasePtr<T>() {
 	}
 #endif