Skip to content

Commit 4f9ebc7

Browse files
committed
Small fixes
1 parent deb3128 commit 4f9ebc7

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

examples/rotozoomer.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ namespace {
5353
constexpr int MAX_LOOPS{314};
5454

5555
// Non-member functions
56+
#if __cplusplus >= 201703L
5657
constexpr auto generateSinTable() noexcept -> std::array<float, MAX_LOOPS>
58+
#else
59+
auto generateSinTable() noexcept -> std::array<float, MAX_LOOPS>
60+
#endif
5761
{
5862
std::array<float, MAX_LOOPS> table{};
5963

@@ -64,7 +68,11 @@ constexpr auto generateSinTable() noexcept -> std::array<float, MAX_LOOPS>
6468
}
6569

6670
//----------------------------------------------------------------------
71+
#if __cplusplus >= 201703L
6772
constexpr auto generateDataPattern() noexcept -> std::array<wchar_t, 256>
73+
#else
74+
auto generateDataPattern() noexcept -> std::array<wchar_t, 256>
75+
#endif
6876
{
6977
std::array<wchar_t, 256> arr{};
7078
const std::array<wchar_t, 4> init_val{{L' ', L'+', L'x', L' '}};

final/vterm/fvterm.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,16 +2250,14 @@ inline auto FVTerm::printCharacterOnCoordinate ( FTermArea* area
22502250
if ( *ac == ch ) // compare with an overloaded operator
22512251
return ac->attr.bit.char_width;
22522252

2253-
auto& line_changes = area->changes_in_line[ay];
2254-
22552253
const bool trans_old =
22562254
(ac->attr.byte[1] & internal::var::b1_print_transparent_mask) != 0;
22572255
const bool trans_new =
22582256
(ch.attr.byte[1] & internal::var::b1_print_transparent_mask) != 0;
22592257
const auto trans_changed = int(trans_new) - int(trans_old);
22602258

22612259
if ( trans_changed != 0 )
2262-
line_changes.trans_count += trans_changed;
2260+
area->changes_in_line[ay].trans_count += trans_changed;
22632261

22642262
// copy character to area
22652263
*ac = ch;

0 commit comments

Comments
 (0)