From 3dd37c687e2b79639f11280bfd351c8b6887423b Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Fri, 15 Jan 2021 11:21:24 +0000 Subject: [PATCH] Fixes PCH and removes unused warnings after 25332f9b86. This was SVN commit r24627. --- source/graphics/PreprocessorWrapper.cpp | 1 + .../ogre3d_preprocessor/tests/test_Preprocessor.h | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/graphics/PreprocessorWrapper.cpp b/source/graphics/PreprocessorWrapper.cpp index 58c8e5d8ea..1e4491a479 100644 --- a/source/graphics/PreprocessorWrapper.cpp +++ b/source/graphics/PreprocessorWrapper.cpp @@ -21,6 +21,7 @@ #include "graphics/ShaderDefines.h" #include "ps/CLogger.h" +#include "ps/Profile.h" #include diff --git a/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h b/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h index 16e2f6f022..79bb5dd0c3 100644 --- a/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h +++ b/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h @@ -18,6 +18,7 @@ #include "lib/self_test.h" #include "graphics/PreprocessorWrapper.h" +#include "lib/timer.h" #include "ps/CStr.h" #include "third_party/ogre3d_preprocessor/OgreGLSLPreprocessor.h" @@ -200,7 +201,7 @@ public: { int includeRetrievedCounter = 0; CPreprocessorWrapper::IncludeRetrieverCallback includeCallback = [&includeRetrievedCounter]( - const CStr& includePath, CStr& out) { + const CStr& UNUSED(includePath), CStr& out) { out = "42"; ++includeRetrievedCounter; return true; @@ -217,7 +218,7 @@ public: void test_include_invalid_file() { CPreprocessorWrapper::IncludeRetrieverCallback includeCallback = []( - const CStr& includePath, CStr& out) { + const CStr& UNUSED(includePath), CStr& UNUSED(out)) { return false; }; @@ -231,7 +232,7 @@ public: void test_include_with_defines() { CPreprocessorWrapper::IncludeRetrieverCallback includeCallback = []( - const CStr& includePath, CStr& out) { + const CStr& UNUSED(includePath), CStr& out) { out = R"( #if defined(A) #define X 41