Date: Wed, 26 Feb 2020 18:05:27 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527178 - head/emulators/ppsspp/files Message-ID: <202002261805.01QI5RCA065140@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Feb 26 18:05:27 2020 New Revision: 527178 URL: https://svnweb.freebsd.org/changeset/ports/527178 Log: emulators/ppsspp: unbreak with Clang 10 In file included from Common/Vulkan/VulkanContext.cpp:28: In file included from ext/glslang/SPIRV/GlslangToSpv.h:42: In file included from ext/glslang/SPIRV/SpvTools.h:47: In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/localintermediate.h:42: In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/intermediate.h:55: In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/../Include/Common.h:108: ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator' void setAllocator(TPoolAllocator* a) { allocator = *a; } ~~~~~~~~~ ^ ~~ ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/PoolAlloc.h:244:21: note: declared private here TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator ^ Reported by: antoine (via bug 244251 exp-run) Added: head/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h (contents, props changed) Added: head/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h Wed Feb 26 18:05:27 2020 (r527178) @@ -0,0 +1,25 @@ +https://github.com/KhronosGroup/glslang/commit/24b3e8384e93 + +In file included from Common/Vulkan/VulkanContext.cpp:28: +In file included from ext/glslang/SPIRV/GlslangToSpv.h:42: +In file included from ext/glslang/SPIRV/SpvTools.h:47: +In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/localintermediate.h:42: +In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/intermediate.h:55: +In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/../Include/Common.h:108: +ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator' + void setAllocator(TPoolAllocator* a) { allocator = *a; } + ~~~~~~~~~ ^ ~~ +ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/PoolAlloc.h:244:21: note: declared private here + TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator + ^ + +--- ext/glslang/glslang/Include/PoolAlloc.h.orig 2019-06-18 08:00:46 UTC ++++ ext/glslang/glslang/Include/PoolAlloc.h +@@ -304,7 +304,6 @@ class pool_allocator { (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; } + TPoolAllocator& getAllocator() const { return allocator; } + + protected:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002261805.01QI5RCA065140>