Attachment 212028 Details for Bug 244504 – Fix devel/glslang build with clang 10.0.0

[patch] Fix devel/glslang build with clang 10.0.0

devel__glslang-fix-clang10-build-1.diff (text/plain), 1.46 KB, created by Dimitry Andric on 2020-02-28 17:32:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2020-02-28 17:32:16 UTC

Size: 1.46 KB

patch

obsolete

>Index: devel/glslang/files/patch-glslang_Include_PoolAlloc.h
>===================================================================
>--- devel/glslang/files/patch-glslang_Include_PoolAlloc.h	(nonexistent)
>+++ devel/glslang/files/patch-glslang_Include_PoolAlloc.h	(working copy)
>@@ -0,0 +1,20 @@
>+commit 24b3e8384e93f3e73b6aa14ea00a30574112f9ba
>+Author: Reid Kleckner <rnk@google.com>
>+Date:   Wed Dec 4 14:09:03 2019 -0800
>+
>+    Remove glslang::pool_allocator::setAllocator
>+    
>+    TPoolAllocator is not copy assignable, so this setter could never have
>+    been used. After a recent change (878a24ee2), new versions of Clang
>+    reject this code outright.
>+
>+--- glslang/Include/PoolAlloc.h.orig	2019-05-09 08:11:28 UTC
>++++ 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:
>
>Property changes on: devel/glslang/files/patch-glslang_Include_PoolAlloc.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 244504: 212028