From 487c17d1d81845404c8066e115c957eb16df1cf6 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 17 Dec 2017 21:16:11 -0400 Subject: [PATCH] Attempt to fix compilation with gcc. --- src/libraries/glslang/glslang/Include/PoolAlloc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/glslang/glslang/Include/PoolAlloc.h b/src/libraries/glslang/glslang/Include/PoolAlloc.h index 0e237a6a2..cc7f4000e 100644 --- a/src/libraries/glslang/glslang/Include/PoolAlloc.h +++ b/src/libraries/glslang/glslang/Include/PoolAlloc.h @@ -281,6 +281,8 @@ public: pool_allocator(TPoolAllocator& a) : allocator(a) { } pool_allocator(const pool_allocator& p) : allocator(p.allocator) { } + pool_allocator& operator=(const pool_allocator&) { return *this; } + template pool_allocator(const pool_allocator& p) : allocator(p.getAllocator()) { } @@ -308,7 +310,6 @@ public: TPoolAllocator& getAllocator() const { return allocator; } protected: - pool_allocator& operator=(const pool_allocator&) { return *this; } TPoolAllocator& allocator; };