Skip to content

Commit 17a59c0

Browse files
stanmihai4pantor
andauthored
fix warnings with VS2019, W4, c++20 (#230)
* fix warnings with VS2019, W4, c++20 * update single include Co-authored-by: Berscheid <[email protected]> Co-authored-by: pantor <[email protected]>
1 parent 72f9012 commit 17a59c0

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

include/inja/parser.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Parser {
122122
}
123123
}
124124

125-
std::string parse_filename(const Token& tok) const {
125+
std::string parse_filename() const {
126126
if (tok.kind != Token::Kind::String) {
127127
throw_parser_error("expected string, got '" + tok.describe() + "'");
128128
}
@@ -512,7 +512,7 @@ class Parser {
512512
} else if (tok.text == static_cast<decltype(tok.text)>("include")) {
513513
get_next_token();
514514

515-
std::string template_name = parse_filename(tok);
515+
std::string template_name = parse_filename();
516516
add_to_template_storage(path, template_name);
517517

518518
current_block->nodes.emplace_back(std::make_shared<IncludeStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
@@ -521,7 +521,7 @@ class Parser {
521521
} else if (tok.text == static_cast<decltype(tok.text)>("extends")) {
522522
get_next_token();
523523

524-
std::string template_name = parse_filename(tok);
524+
std::string template_name = parse_filename();
525525
add_to_template_storage(path, template_name);
526526

527527
current_block->nodes.emplace_back(std::make_shared<ExtendsStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));

include/inja/renderer.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ class Renderer : public NodeVisitor {
352352
} break;
353353
case Op::Lower: {
354354
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
355-
std::transform(result.begin(), result.end(), result.begin(), ::tolower);
355+
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::tolower(c)); });
356356
make_result(std::move(result));
357357
} break;
358358
case Op::Max: {
@@ -391,7 +391,7 @@ class Renderer : public NodeVisitor {
391391
} break;
392392
case Op::Upper: {
393393
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
394-
std::transform(result.begin(), result.end(), result.begin(), ::toupper);
394+
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::toupper(c)); });
395395
make_result(std::move(result));
396396
} break;
397397
case Op::IsBoolean: {

single_include/inja/inja.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ class Parser {
15361536
}
15371537
}
15381538

1539-
std::string parse_filename(const Token& tok) const {
1539+
std::string parse_filename() const {
15401540
if (tok.kind != Token::Kind::String) {
15411541
throw_parser_error("expected string, got '" + tok.describe() + "'");
15421542
}
@@ -1926,7 +1926,7 @@ class Parser {
19261926
} else if (tok.text == static_cast<decltype(tok.text)>("include")) {
19271927
get_next_token();
19281928

1929-
std::string template_name = parse_filename(tok);
1929+
std::string template_name = parse_filename();
19301930
add_to_template_storage(path, template_name);
19311931

19321932
current_block->nodes.emplace_back(std::make_shared<IncludeStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
@@ -1935,7 +1935,7 @@ class Parser {
19351935
} else if (tok.text == static_cast<decltype(tok.text)>("extends")) {
19361936
get_next_token();
19371937

1938-
std::string template_name = parse_filename(tok);
1938+
std::string template_name = parse_filename();
19391939
add_to_template_storage(path, template_name);
19401940

19411941
current_block->nodes.emplace_back(std::make_shared<ExtendsStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
@@ -2428,7 +2428,7 @@ class Renderer : public NodeVisitor {
24282428
} break;
24292429
case Op::Lower: {
24302430
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
2431-
std::transform(result.begin(), result.end(), result.begin(), ::tolower);
2431+
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::tolower(c)); });
24322432
make_result(std::move(result));
24332433
} break;
24342434
case Op::Max: {
@@ -2467,7 +2467,7 @@ class Renderer : public NodeVisitor {
24672467
} break;
24682468
case Op::Upper: {
24692469
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
2470-
std::transform(result.begin(), result.end(), result.begin(), ::toupper);
2470+
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::toupper(c)); });
24712471
make_result(std::move(result));
24722472
} break;
24732473
case Op::IsBoolean: {

0 commit comments

Comments
 (0)