diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-02-26 18:29:51 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-02-26 18:29:51 +0000 |
| commit | 0991c8399f2be2ebfe55c140e59a883cf8b64a46 (patch) | |
| tree | 095f85e609ec71c534d9c7feb053a38700510435 /emulators/dolphin-emu | |
| parent | 9f33ab1e752f0873d38230c08d2b56a4539c7fb6 (diff) | |
| download | ports-0991c8399f2be2ebfe55c140e59a883cf8b64a46.tar.gz ports-0991c8399f2be2ebfe55c140e59a883cf8b64a46.zip | |
emulators/dolphin-emu: unbreak with Clang 10
In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:35:
In file included from Externals/glslang/glslang/GenericCodeGen/../Include/Common.h:107:
Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
void setAllocator(TPoolAllocator* a) { allocator = *a; }
~~~~~~~~~ ^ ~~
Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:244:21: note: declared private here
TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator
^
In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:36:
In file included from Externals/glslang/glslang/GenericCodeGen/../Include/ShHandle.h:46:
Externals/glslang/glslang/GenericCodeGen/../Include/../Public/ShaderLang.h:85:22: warning: '__fastcall__' calling convention is not supported for this target [-Wignored-attributes]
SH_IMPORT_EXPORT int __fastcall ShFinalize();
^
Reported by: antoine (via bug 244251 exp-run)
Notes
Notes:
svn path=/head/; revision=527182
Diffstat (limited to 'emulators/dolphin-emu')
| -rw-r--r-- | emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h b/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h new file mode 100644 index 000000000000..0461e410084a --- /dev/null +++ b/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h @@ -0,0 +1,26 @@ +https://github.com/KhronosGroup/glslang/commit/24b3e8384e93 + +In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:35: +In file included from Externals/glslang/glslang/GenericCodeGen/../Include/Common.h:107: +Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator' + void setAllocator(TPoolAllocator* a) { allocator = *a; } + ~~~~~~~~~ ^ ~~ +Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:244:21: note: declared private here + TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator + ^ +In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:36: +In file included from Externals/glslang/glslang/GenericCodeGen/../Include/ShHandle.h:46: +Externals/glslang/glslang/GenericCodeGen/../Include/../Public/ShaderLang.h:85:22: warning: '__fastcall__' calling convention is not supported for this target [-Wignored-attributes] +SH_IMPORT_EXPORT int __fastcall ShFinalize(); + ^ + +--- Externals/glslang/glslang/Include/PoolAlloc.h.orig 2019-10-07 00:46:03 UTC ++++ Externals/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: |