svn commit: r527180 - head/games/gzdoom/files

Jan Beich jbeich at FreeBSD.org
Wed Feb 26 18:13:50 UTC 2020


Author: jbeich
Date: Wed Feb 26 18:13:48 2020
New Revision: 527180
URL: https://svnweb.freebsd.org/changeset/ports/527180

Log:
  games/gzdoom: unbreak with Clang 10
  
  In file included from MachineIndependent/glslang.y:60:
  In file included from glslang/glslang/MachineIndependent/SymbolTable.h:68:
  In file included from glslang/glslang/MachineIndependent/../Include/Common.h:107:
  glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
      void setAllocator(TPoolAllocator* a) { allocator = *a; }
                                             ~~~~~~~~~ ^ ~~
  glslang/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/games/gzdoom/files/patch-glslang_glslang_Include_PoolAlloc.h   (contents, props changed)

Added: head/games/gzdoom/files/patch-glslang_glslang_Include_PoolAlloc.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/gzdoom/files/patch-glslang_glslang_Include_PoolAlloc.h	Wed Feb 26 18:13:48 2020	(r527180)
@@ -0,0 +1,22 @@
+https://github.com/KhronosGroup/glslang/commit/24b3e8384e93
+
+In file included from MachineIndependent/glslang.y:60:
+In file included from glslang/glslang/MachineIndependent/SymbolTable.h:68:
+In file included from glslang/glslang/MachineIndependent/../Include/Common.h:107:
+glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
+    void setAllocator(TPoolAllocator* a) { allocator = *a; }
+                                           ~~~~~~~~~ ^ ~~
+glslang/glslang/MachineIndependent/../Include/PoolAlloc.h:244:21: note: declared private here
+    TPoolAllocator& operator=(const TPoolAllocator&);  // don't allow assignment operator
+                    ^
+
+--- glslang/glslang/Include/PoolAlloc.h.orig	2019-05-04 19:58:35 UTC
++++ 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:


More information about the svn-ports-all mailing list