mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00
Code Issues Releases Activity

emulators/dolphin-emu: unbreak with Clang 10

Browse Source 
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)
This commit is contained in:
Jan Beich 2020-02-26 18:29:51 +00:00
parent 9f33ab1e75
commit 0991c8399f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527182
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h Normal file
View File

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