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

[aquadran]

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:
cdc0ad802d MORPHOS : Fixes clashing D in ptr.h with system defines and casting glGetString (#2531)


Commit: cdc0ad802d70ba4c42e7d961557377c43381ea7d
    https://github.com/scummvm/scummvm/commit/cdc0ad802d70ba4c42e7d961557377c43381ea7d
Author: BeWorld (36823759+BeWorld2018 at users.noreply.github.com)
Date: 2020-10-16T21:26:42+02:00

Commit Message:
MORPHOS : Fixes clashing D in ptr.h with system defines and casting glGetString (#2531)

MORPHOS : Fixes clashing D in ptr.h with system defines and casting glGetString

Changed paths:
    backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
    common/ptr.h


diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
index 85fd788bd5..d6b3241c8f 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -201,7 +201,11 @@ void OpenGLSdlGraphics3dManager::setupScreen() {
 	createOrUpdateScreen();
 
 	int glflag;
+#ifdef __MORPHOS__
+	const GLbyte *str;
+#else
 	const GLubyte *str;
+#endif
 
 	str = glGetString(GL_VENDOR);
 	debug("INFO: OpenGL Vendor: %s", str);
diff --git a/common/ptr.h b/common/ptr.h
index cc247f12a6..802e84d6d0 100644
--- a/common/ptr.h
+++ b/common/ptr.h
@@ -55,14 +55,14 @@ private:
 	T *_ptr;
 };
 
-template<class T, class D>
+template<class T, class DL>
 class SharedPtrDeletionDeleterImpl : public SharedPtrDeletionInternal {
 public:
-	SharedPtrDeletionDeleterImpl(T *ptr, D d) : _ptr(ptr), _deleter(d) {}
+	SharedPtrDeletionDeleterImpl(T *ptr, DL d) : _ptr(ptr), _deleter(d) {}
 	~SharedPtrDeletionDeleterImpl() { _deleter(_ptr); }
 private:
 	T *_ptr;
-	D _deleter;
+	DL _deleter;
 };
 
 /**
@@ -122,8 +122,8 @@ public:
 	template<class T2>
 	explicit SharedPtr(T2 *p) : _refCount(new RefValue(1)), _deletion(new SharedPtrDeletionImpl<T2>(p)), _pointer(p) {}
 
-	template<class T2, class D>
-	SharedPtr(T2 *p, D d) : _refCount(new RefValue(1)), _deletion(new SharedPtrDeletionDeleterImpl<T2, D>(p, d)), _pointer(p) {}
+	template<class T2, class DL>
+	SharedPtr(T2 *p, DL d) : _refCount(new RefValue(1)), _deletion(new SharedPtrDeletionDeleterImpl<T2, DL>(p, d)), _pointer(p) {}
 
 	SharedPtr(const SharedPtr &r) : _refCount(r._refCount), _deletion(r._deletion), _pointer(r._pointer) { if (_refCount) ++(*_refCount); }
 	template<class T2>
@@ -234,8 +234,8 @@ struct DefaultDeleter {
 	}
 };
 
-template<typename T, class D = DefaultDeleter<T> >
-class ScopedPtr : private NonCopyable, public SafeBool<ScopedPtr<T, D> > {
+template<typename T, class DL = DefaultDeleter<T> >
+class ScopedPtr : private NonCopyable, public SafeBool<ScopedPtr<T, DL> > {
 public:
 	typedef T ValueType;
 	typedef T *PointerType;
@@ -253,14 +253,14 @@ public:
 	bool operator_bool() const { return _pointer != nullptr; }
 
 	~ScopedPtr() {
-		D()(_pointer);
+		DL()(_pointer);
 	}
 
 	/**
 	 * Resets the pointer with the new value. Old object will be destroyed
 	 */
 	void reset(PointerType o = nullptr) {
-		D()(_pointer);
+		DL()(_pointer);
 		_pointer = o;
 	}
 
@@ -287,8 +287,8 @@ private:
 	PointerType _pointer;
 };
 
-template<typename T, class D = DefaultDeleter<T> >
-class DisposablePtr : private NonCopyable, public SafeBool<DisposablePtr<T, D> > {
+template<typename T, class DL = DefaultDeleter<T> >
+class DisposablePtr : private NonCopyable, public SafeBool<DisposablePtr<T, DL> > {
 public:
 	typedef T  ValueType;
 	typedef T *PointerType;
@@ -297,7 +297,7 @@ public:
 	explicit DisposablePtr(PointerType o, DisposeAfterUse::Flag dispose) : _pointer(o), _dispose(dispose) {}
 
 	~DisposablePtr() {
-		if (_dispose) D()(_pointer);
+		if (_dispose) DL()(_pointer);
 	}
 
 	ReferenceType operator*() const { return *_pointer; }
@@ -313,7 +313,7 @@ public:
 	 * Resets the pointer with the new value. Old object will be destroyed
 	 */
 	void reset(PointerType o, DisposeAfterUse::Flag dispose) {
-		if (_dispose) D()(_pointer);
+		if (_dispose) DL()(_pointer);
 		_pointer = o;
 		_dispose = dispose;
 	}