Memory/constructor/warning clean-up. Addresses issue #705.

KhronosGroup · Feb 2, 2017 · 32fd5d2 · 32fd5d2
1 parent f1aeac8
commit 32fd5d2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/glslang/Include/PoolAlloc.h b/glslang/Include/PoolAlloc.h
@@ -255,7 +255,7 @@ extern TPoolAllocator& GetThreadPoolAllocator();
 
 struct TThreadMemoryPools
 {
-        TPoolAllocator* threadPoolAllocator;
+    TPoolAllocator* threadPoolAllocator;
 };
 
 void SetThreadPoolAllocator(TPoolAllocator& poolAllocator);

diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
 // For the version, it uses the latest git tag followed by the number of commits.
 // For the date, it uses the current date (when then script is run).
 
-#define GLSLANG_REVISION "Overload400-PrecQual.1773"
-#define GLSLANG_DATE "19-Jan-2017"
+#define GLSLANG_REVISION "Overload400-PrecQual.1804"
+#define GLSLANG_DATE "02-Feb-2017"
diff --git a/glslang/MachineIndependent/PoolAlloc.cpp b/glslang/MachineIndependent/PoolAlloc.cpp
@@ -105,8 +105,8 @@ void SetThreadPoolAllocator(TPoolAllocator& poolAllocator)
 TPoolAllocator::TPoolAllocator(int growthIncrement, int allocationAlignment) :
     pageSize(growthIncrement),
     alignment(allocationAlignment),
-    freeList(0),
-    inUseList(0),
+    freeList(nullptr),
+    inUseList(nullptr),
     numCalls(0)
 {
     //

diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp
@@ -1632,6 +1632,7 @@ TProgram::TProgram() : pool(0), reflection(0), ioMapper(nullptr), linked(false)
 
 TProgram::~TProgram()
 {
+    delete ioMapper;
     delete infoSink;
     delete reflection;
 

diff --git a/glslang/MachineIndependent/iomapper.cpp b/glslang/MachineIndependent/iomapper.cpp
@@ -209,6 +209,9 @@ struct TResolverAdaptor
     TIoMapResolver& resolver;
     TInfoSink&      infoSink;
     bool&           error;
+
+private:
+    TResolverAdaptor& operator=(TResolverAdaptor&);
 };
 
 /*

diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
@@ -540,6 +540,7 @@ class TProgram {
     bool linked;
 
 private:
+    TProgram(TProgram&);
     TProgram& operator=(TProgram&);
 };
 

diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
@@ -2319,6 +2319,8 @@ bool HlslGrammar::acceptPostfixExpression(TIntermTyped*& node)
         tFinalize(HlslParseContext& p) : parseContext(p) { }
         ~tFinalize() { parseContext.finalizeFlattening(); }
        HlslParseContext& parseContext;
+    private:
+        tFinalize& operator=(tFinalize&) { }
     } finalize(parseContext);
 
     // Initialize the flattening accumulation data, so we can track data across multiple bracket or