Code refactoring: replace NULL by nullptr for pointers.
This is the frist change to replace NULL by nullptr.
It handles the initialization and assignment for pointers.
BUG=angleproject:2001
Change-Id: I6d4bb198a72e38b867cd2f65a6e6f2f61339a0b5
Reviewed-on: https://chromium-review.googlesource.com/481600
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index a09c505..e1edaaa 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -677,7 +677,7 @@
nameMap.clear();
- mSourcePath = NULL;
+ mSourcePath = nullptr;
mTemporaryIndex = 0;
}
diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
index c0129da..b95f0ec 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -131,7 +131,7 @@
mInsideDiscontinuousLoop = false;
mNestedLoopDepth = 0;
- mExcessiveLoopIndex = NULL;
+ mExcessiveLoopIndex = nullptr;
mStructureHLSL = new StructureHLSL;
mUniformHLSL = new UniformHLSL(mStructureHLSL, outputType, uniforms);
@@ -2317,7 +2317,7 @@
// Parse loops of the form:
// for(int index = initial; index [comparator] limit; index += increment)
- TIntermSymbol *index = NULL;
+ TIntermSymbol *index = nullptr;
TOperator comparator = EOpNull;
int initial = 0;
int limit = 0;
@@ -2472,7 +2472,7 @@
if (iterations <= MAX_LOOP_ITERATIONS) // Last loop fragment
{
- mExcessiveLoopIndex = NULL; // Stops setting the Break flag
+ mExcessiveLoopIndex = nullptr; // Stops setting the Break flag
}
// for(int index = initial; index < clampedLimit; index += increment)
diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index f469746..ead6016 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -1536,7 +1536,7 @@
const TString *name,
const TSymbol *symbol)
{
- const TVariable *variable = NULL;
+ const TVariable *variable = nullptr;
if (!symbol)
{
diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
index 11b83f3..9ac335a 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -182,7 +182,7 @@
resources->MaxViewsOVR = 2;
// Disable name hashing by default.
- resources->HashFunction = NULL;
+ resources->HashFunction = nullptr;
resources->ArrayIndexClampingStrategy = SH_CLAMP_WITH_CLAMP_INTRINSIC;
diff --git a/src/compiler/translator/ShaderVars.cpp b/src/compiler/translator/ShaderVars.cpp
index 84a4e3d..8660b3b 100644
--- a/src/compiler/translator/ShaderVars.cpp
+++ b/src/compiler/translator/ShaderVars.cpp
@@ -141,7 +141,7 @@
}
for (size_t ii = 0; ii < this->fields.size(); ++ii)
{
- const ShaderVariable *fieldVar = NULL;
+ const ShaderVariable *fieldVar = nullptr;
std::string originalFieldName;
bool found = fields[ii].findInfoByMappedName(remaining, &fieldVar, &originalFieldName);
if (found)
diff --git a/src/compiler/translator/ValidateLimitations.cpp b/src/compiler/translator/ValidateLimitations.cpp
index 3a17614..2a29d14 100644
--- a/src/compiler/translator/ValidateLimitations.cpp
+++ b/src/compiler/translator/ValidateLimitations.cpp
@@ -338,7 +338,7 @@
TIntermBinary *binOp = unOp ? NULL : expr->getAsBinaryNode();
TOperator op = EOpNull;
- TIntermSymbol *symbol = NULL;
+ TIntermSymbol *symbol = nullptr;
if (unOp != NULL)
{
op = unOp->getOp();
diff --git a/src/compiler/translator/VariableInfo.cpp b/src/compiler/translator/VariableInfo.cpp
index a201b4c..9a806fc 100644
--- a/src/compiler/translator/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -107,7 +107,7 @@
void CollectVariables::visitSymbol(TIntermSymbol *symbol)
{
ASSERT(symbol != NULL);
- ShaderVariable *var = NULL;
+ ShaderVariable *var = nullptr;
const TString &symbolName = symbol->getSymbol();
if (IsVarying(symbol->getQualifier()))