Don't use a protected assignment operator for an unused accessor.

6 files changed, 47 insertions, 3 deletions

diff --git a/emulators/libretro-dolphin/distinfo b/emulators/libretro-dolphin/distinfo
index 5488db6c6e5..20b465c2af6 100644
--- a/emulators/libretro-dolphin/distinfo
+++ b/emulators/libretro-dolphin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/10/25 11:04:04 kamil Exp $
+$NetBSD: distinfo,v 1.3 2020/05/14 19:34:45 joerg Exp $
 
 SHA1 (libretro-dolphin-20180827-a5bce7d67abeaa9142d466a578ca5049197073e9.tar.gz) = 10f66e6c88d28a0ee203ce29526c862286a30e65
 RMD160 (libretro-dolphin-20180827-a5bce7d67abeaa9142d466a578ca5049197073e9.tar.gz) = 6c60c2ba633d5195efe8a1c9632c7eea09444b52
@@ -6,6 +6,7 @@ SHA512 (libretro-dolphin-20180827-a5bce7d67abeaa9142d466a578ca5049197073e9.tar.g
 Size (libretro-dolphin-20180827-a5bce7d67abeaa9142d466a578ca5049197073e9.tar.gz) = 37405005 bytes
 SHA1 (patch-CMakeLists.txt) = a2645cbadef33fa5da955f577d7b076b4d56d139
 SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5
+SHA1 (patch-Externals_glslang_glslang_Include_PoolAlloc.h) = 3d774a07593c15ac571de39a692886ac545b22a2
 SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = dd5792447e2a06b0a94e64b33d5bd77f0c439724
 SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 9a0e91980e91f49e39364b46581984115e4c5c4b
 SHA1 (patch-Source_Core_Common_Swap.h) = bbba25b164dac8109c7e95256e108cff2c71924d
diff --git a/emulators/libretro-dolphin/patches/patch-Externals_glslang_glslang_Include_PoolAlloc.h b/emulators/libretro-dolphin/patches/patch-Externals_glslang_glslang_Include_PoolAlloc.h
new file mode 100644
index 00000000000..5b033584fe9
--- /dev/null
+++ b/emulators/libretro-dolphin/patches/patch-Externals_glslang_glslang_Include_PoolAlloc.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-Externals_glslang_glslang_Include_PoolAlloc.h,v 1.1 2020/05/14 19:34:45 joerg Exp $
+
+--- Externals/glslang/glslang/Include/PoolAlloc.h.orig	2020-05-13 18:42:12.978480194 +0000
++++ Externals/glslang/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,7 @@ public:
+     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
+     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
+ 
+-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
++    // void setAllocator(TPoolAllocator* a) { allocator = *a; }
+     TPoolAllocator& getAllocator() const { return allocator; }
+ 
+ protected:
diff --git a/emulators/libretro-ppsspp/distinfo b/emulators/libretro-ppsspp/distinfo
index 7f95fd21b06..cfe4da9bec5 100644
--- a/emulators/libretro-ppsspp/distinfo
+++ b/emulators/libretro-ppsspp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/01/02 19:52:51 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/05/14 19:34:44 joerg Exp $
 
 SHA1 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = bcb620c901b139a9ab28fdce41436d1a88da351d
 RMD160 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = a3b2c9388f4253a069275679d83c8ae9c07fa98a
@@ -16,5 +16,6 @@ SHA1 (ppsspp-1.7.5/ppsspp.tar.gz) = 404e1db43cfe926078b30aefb0c79199cd9c0319
 RMD160 (ppsspp-1.7.5/ppsspp.tar.gz) = 62c542117d39e2d182c2e424d5ec705447afabbb
 SHA512 (ppsspp-1.7.5/ppsspp.tar.gz) = 7e1f93754e8969fee671c2cd8424cdff84b6351b4493f65c71fab4e9b99fc2a7c21c3a41fd051915f5293cda18957625649ba5ea69b88ed3efba9f4128252298
 Size (ppsspp-1.7.5/ppsspp.tar.gz) = 19487276 bytes
+SHA1 (patch-ext_glslang_glslang_Include_PoolAlloc.h) = 2eb3ed7637c9e26011c6e29fda79c72e8aee78c5
 SHA1 (patch-libretro_Makefile) = ff14d98bb21d87b5a27f40b180d73beef7ab2f74
 SHA1 (patch-libretro_Makefile.common) = eebde48b059d8a0a2ec5ae7805e7a2c083f44c1c
diff --git a/emulators/libretro-ppsspp/patches/patch-ext_glslang_glslang_Include_PoolAlloc.h b/emulators/libretro-ppsspp/patches/patch-ext_glslang_glslang_Include_PoolAlloc.h
new file mode 100644
index 00000000000..f88bdc4ee33
--- /dev/null
+++ b/emulators/libretro-ppsspp/patches/patch-ext_glslang_glslang_Include_PoolAlloc.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_glslang_glslang_Include_PoolAlloc.h,v 1.1 2020/05/14 19:34:44 joerg Exp $
+
+setAllocator violates the contract of TPoolAllocator, so drop it.
+
+--- ext/glslang/glslang/Include/PoolAlloc.h.orig	2020-05-13 18:03:35.137900371 +0000
++++ ext/glslang/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,7 @@ public:
+     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
+     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
+ 
+-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
++    //void setAllocator(TPoolAllocator* a) { allocator = *a; }
+     TPoolAllocator& getAllocator() const { return allocator; }
+ 
+ protected:
diff --git a/emulators/retroarch/distinfo b/emulators/retroarch/distinfo
index fd6f91ced8d..c962eee7546 100644
--- a/emulators/retroarch/distinfo
+++ b/emulators/retroarch/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2019/05/20 12:42:40 nia Exp $
+$NetBSD: distinfo,v 1.16 2020/05/14 19:34:44 joerg Exp $
 
 SHA1 (RetroArch-1.7.7.tar.xz) = 32288d3cc23319280c80968e9f0446e00f24db19
 RMD160 (RetroArch-1.7.7.tar.xz) = e019c8a6486706e076878adc0510178e5c8d5d81
@@ -7,6 +7,7 @@ Size (RetroArch-1.7.7.tar.xz) = 220787816 bytes
 SHA1 (patch-Makefile) = a4dd20cf34724f79e4cc886c5d7a383a11d2e42d
 SHA1 (patch-audio_drivers_audioio.c) = 50820a7f3fbf7685098efdb794dd4efa485df806
 SHA1 (patch-configuration.c) = 58873db839f8f0ed2e011d4c4c75b00e6293c239
+SHA1 (patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h) = b038656f8b81296634ca8f1381b960719da59447
 SHA1 (patch-frontend_drivers_platform__unix.c) = e81ba53af2bdd4cecc4007cc9556f06446bf3b3f
 SHA1 (patch-input_include_xfree86__keycodes.h) = cd3b59122e9075a96fccb01bce2110dfa9cc160e
 SHA1 (patch-libretro-common_features_features__cpu.c) = da4a66b16ef7ca194443a65e4efb8887e6d9bc3e
diff --git a/emulators/retroarch/patches/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h b/emulators/retroarch/patches/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h
new file mode 100644
index 00000000000..6d43223a416
--- /dev/null
+++ b/emulators/retroarch/patches/patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-deps_glslang_glslang_glslang_Include_PoolAlloc.h,v 1.1 2020/05/14 19:34:44 joerg Exp $
+
+--- deps/glslang/glslang/glslang/Include/PoolAlloc.h.orig	2020-05-13 21:50:19.139232481 +0000
++++ deps/glslang/glslang/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,7 @@ public:
+     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
+     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
+ 
+-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
++    // void setAllocator(TPoolAllocator* a) { allocator = *a; }
+     TPoolAllocator& getAllocator() const { return allocator; }
+ 
+ protected: