1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

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)
This commit is contained in:
Jan Beich 2020-02-26 18:05:27 +00:00
parent 884bc5c86d
commit 3232f3f44a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=527178

View File

@ -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: