Skip to content

Commit 32fd5d2

Browse files
committed
Memory/constructor/warning clean-up. Addresses issue #705.
1 parent f1aeac8 commit 32fd5d2

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

glslang/Include/PoolAlloc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ extern TPoolAllocator& GetThreadPoolAllocator();
255255

256256
struct TThreadMemoryPools
257257
{
258-
TPoolAllocator* threadPoolAllocator;
258+
TPoolAllocator* threadPoolAllocator;
259259
};
260260

261261
void SetThreadPoolAllocator(TPoolAllocator& poolAllocator);

glslang/Include/revision.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// For the version, it uses the latest git tag followed by the number of commits.
33
// For the date, it uses the current date (when then script is run).
44

5-
#define GLSLANG_REVISION "Overload400-PrecQual.1773"
6-
#define GLSLANG_DATE "19-Jan-2017"
5+
#define GLSLANG_REVISION "Overload400-PrecQual.1804"
6+
#define GLSLANG_DATE "02-Feb-2017"

glslang/MachineIndependent/PoolAlloc.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ void SetThreadPoolAllocator(TPoolAllocator& poolAllocator)
105105
TPoolAllocator::TPoolAllocator(int growthIncrement, int allocationAlignment) :
106106
pageSize(growthIncrement),
107107
alignment(allocationAlignment),
108-
freeList(0),
109-
inUseList(0),
108+
freeList(nullptr),
109+
inUseList(nullptr),
110110
numCalls(0)
111111
{
112112
//

glslang/MachineIndependent/ShaderLang.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1632,6 +1632,7 @@ TProgram::TProgram() : pool(0), reflection(0), ioMapper(nullptr), linked(false)
16321632

16331633
TProgram::~TProgram()
16341634
{
1635+
delete ioMapper;
16351636
delete infoSink;
16361637
delete reflection;
16371638

glslang/MachineIndependent/iomapper.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ struct TResolverAdaptor
209209
TIoMapResolver& resolver;
210210
TInfoSink& infoSink;
211211
bool& error;
212+
213+
private:
214+
TResolverAdaptor& operator=(TResolverAdaptor&);
212215
};
213216

214217
/*

glslang/Public/ShaderLang.h

+1
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ class TProgram {
540540
bool linked;
541541

542542
private:
543+
TProgram(TProgram&);
543544
TProgram& operator=(TProgram&);
544545
};
545546

hlsl/hlslGrammar.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -2319,6 +2319,8 @@ bool HlslGrammar::acceptPostfixExpression(TIntermTyped*& node)
23192319
tFinalize(HlslParseContext& p) : parseContext(p) { }
23202320
~tFinalize() { parseContext.finalizeFlattening(); }
23212321
HlslParseContext& parseContext;
2322+
private:
2323+
tFinalize& operator=(tFinalize&) { }
23222324
} finalize(parseContext);
23232325

23242326
// Initialize the flattening accumulation data, so we can track data across multiple bracket or

0 commit comments

Comments
 (0)