Skip to content

Commit 7d1b460

Browse files
committed
fix more clang-tidy warnings
1 parent d222ad2 commit 7d1b460

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

include/inja/renderer.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class Renderer : public NodeVisitor {
350350
} break;
351351
case Op::Default: {
352352
const auto test_arg = get_arguments<1, 0, false>(node)[0];
353-
data_eval_stack.push(test_arg ? test_arg : get_arguments<1, 1>(node)[0]);
353+
data_eval_stack.push((test_arg != nullptr) ? test_arg : get_arguments<1, 1>(node)[0]);
354354
} break;
355355
case Op::DivisibleBy: {
356356
const auto args = get_arguments<2>(node);
@@ -425,7 +425,7 @@ class Renderer : public NodeVisitor {
425425
const auto precision = args[1]->get<const json::number_integer_t>();
426426
const double result = std::round(args[0]->get<const json::number_float_t>() * std::pow(10.0, precision)) / std::pow(10.0, precision);
427427
if (precision == 0) {
428-
make_result(int(result));
428+
make_result(static_cast<int>(result));
429429
} else {
430430
make_result(result);
431431
}
@@ -557,7 +557,7 @@ class Renderer : public NodeVisitor {
557557
additional_data[static_cast<std::string>(node.value)].clear();
558558
if (!(*current_loop_data)["parent"].empty()) {
559559
const auto tmp = (*current_loop_data)["parent"];
560-
*current_loop_data = std::move(tmp);
560+
*current_loop_data = tmp;
561561
} else {
562562
current_loop_data = &additional_data["loop"];
563563
}

include/inja/statistics.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ class StatisticsVisitor : public NodeVisitor {
6363
void visit(const SetStatementNode&) override {}
6464

6565
public:
66-
size_t variable_counter;
66+
size_t variable_counter {0};
6767

68-
explicit StatisticsVisitor(): variable_counter(0) {}
68+
explicit StatisticsVisitor() {}
6969
};
7070

7171
} // namespace inja

single_include/inja/inja.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -807,9 +807,9 @@ class StatisticsVisitor : public NodeVisitor {
807807
void visit(const SetStatementNode&) override {}
808808

809809
public:
810-
size_t variable_counter;
810+
size_t variable_counter {0};
811811

812-
explicit StatisticsVisitor(): variable_counter(0) {}
812+
explicit StatisticsVisitor() {}
813813
};
814814

815815
} // namespace inja
@@ -2503,7 +2503,7 @@ class Renderer : public NodeVisitor {
25032503
} break;
25042504
case Op::Default: {
25052505
const auto test_arg = get_arguments<1, 0, false>(node)[0];
2506-
data_eval_stack.push(test_arg ? test_arg : get_arguments<1, 1>(node)[0]);
2506+
data_eval_stack.push((test_arg != nullptr) ? test_arg : get_arguments<1, 1>(node)[0]);
25072507
} break;
25082508
case Op::DivisibleBy: {
25092509
const auto args = get_arguments<2>(node);
@@ -2578,7 +2578,7 @@ class Renderer : public NodeVisitor {
25782578
const auto precision = args[1]->get<const json::number_integer_t>();
25792579
const double result = std::round(args[0]->get<const json::number_float_t>() * std::pow(10.0, precision)) / std::pow(10.0, precision);
25802580
if (precision == 0) {
2581-
make_result(int(result));
2581+
make_result(static_cast<int>(result));
25822582
} else {
25832583
make_result(result);
25842584
}
@@ -2710,7 +2710,7 @@ class Renderer : public NodeVisitor {
27102710
additional_data[static_cast<std::string>(node.value)].clear();
27112711
if (!(*current_loop_data)["parent"].empty()) {
27122712
const auto tmp = (*current_loop_data)["parent"];
2713-
*current_loop_data = std::move(tmp);
2713+
*current_loop_data = tmp;
27142714
} else {
27152715
current_loop_data = &additional_data["loop"];
27162716
}

0 commit comments

Comments
 (0)