From 4db59d587e9030321663c646ea7cb6b09b7d2075 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Sat, 15 Jun 2024 06:21:34 +0200 Subject: [PATCH] Revert "Third parameter of std::remove prob needs to be nullptr" This reverts commit 1b161fad1d9aa468e0916c6e5b80853d774037bd. --- .../glslang/glslang/glslang/MachineIndependent/linkValidate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp b/deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp index b1e2468421..b08f104457 100644 --- a/deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp +++ b/deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp @@ -681,7 +681,7 @@ void TIntermediate::checkCallGraphBodies(TInfoSink& infoSink, bool keepUncalled) if (! reachable[f]) functionSequence[f] = NULL; } - functionSequence.erase(std::remove(functionSequence.begin(), functionSequence.end(), nullptr), functionSequence.end()); + functionSequence.erase(std::remove(functionSequence.begin(), functionSequence.end(), NULL), functionSequence.end()); } }