Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-12-07 21:19:55 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-12-07 21:52:54 +0300
commit763cd2e0beead45d331ea0b781c2c0cec0f71242 (patch)
tree381dacc543863579391b771b7c1c6c96a063091e /intern/cycles/util/path.cpp
parent5bd41b2e255cb0de40cab17a90ca380aa12a9e5a (diff)
Cleanup: fix compiler warning
Diffstat (limited to 'intern/cycles/util/path.cpp')
-rw-r--r--intern/cycles/util/path.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/util/path.cpp b/intern/cycles/util/path.cpp
index 243b3187f2e..e27c929fba9 100644
--- a/intern/cycles/util/path.cpp
+++ b/intern/cycles/util/path.cpp
@@ -766,7 +766,6 @@ static string path_source_replace_includes_recursive(const string &source,
static string path_source_handle_preprocessor(const string &preprocessor_line,
const string &source_filepath,
- const size_t line_number,
SourceReplaceState *state)
{
string result = preprocessor_line;
@@ -857,8 +856,7 @@ static string path_source_replace_includes_recursive(const string &_source,
if (ch == '\n') {
if (inside_preprocessor) {
- string block = path_source_handle_preprocessor(
- preprocessor_line, source_filepath, line_number, state);
+ string block = path_source_handle_preprocessor(preprocessor_line, source_filepath, state);
if (!block.empty()) {
result += block;
@@ -899,8 +897,7 @@ static string path_source_replace_includes_recursive(const string &_source,
result.append(source, token_start, token_length);
}
if (inside_preprocessor) {
- result += path_source_handle_preprocessor(
- preprocessor_line, source_filepath, line_number, state);
+ result += path_source_handle_preprocessor(preprocessor_line, source_filepath, state);
}
/* Store result for further reuse. */
state->processed_files[source_filepath] = result;