From d802d392811be44d34ae9cd23f616db93e54c50f Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 9 Mar 2014 21:14:26 +0100 Subject: clang-modernize -use-nullptr and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine --- Source/Core/VideoCommon/VertexShaderGen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/VertexShaderGen.cpp') diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp index 3e2e02eecd..67c18286aa 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/VertexShaderGen.cpp @@ -60,17 +60,17 @@ static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_typ { // Non-uid template parameters will write to the dummy data (=> gets optimized out) vertex_shader_uid_data dummy_data; - vertex_shader_uid_data& uid_data = (&out.template GetUidData() != NULL) + vertex_shader_uid_data& uid_data = (&out.template GetUidData() != nullptr) ? out.template GetUidData() : dummy_data; out.SetBuffer(text); - const bool is_writing_shadercode = (out.GetBuffer() != NULL); + const bool is_writing_shadercode = (out.GetBuffer() != nullptr); #ifndef ANDROID locale_t locale; locale_t old_locale; if (is_writing_shadercode) { - locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation + locale = newlocale(LC_NUMERIC_MASK, "C", nullptr); // New locale for compilation old_locale = uselocale(locale); // Apply the locale for this thread } #endif -- cgit v1.2.3