Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix an apparent x86 miscompilation on MSVC 19.38 #16742

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Fix an apparent x86 miscompilation on MSVC 19.38 #16742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3222983
Fix a x86 miscompilation caused by MSVC 19.38
lhecker Feb 21, 2024
52d4a7b
This is a weird API
lhecker Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/inc/til/bitmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
using pointer = const til::rect*;
using reference = const til::rect&;

_bitmap_const_iterator(const dynamic_bitset<unsigned long long, Allocator>& values, til::rect rc, ptrdiff_t pos) :
_bitmap_const_iterator(const dynamic_bitset<size_t, Allocator>& values, til::rect rc, ptrdiff_t pos) :
_values(values),
_rc(rc),
_pos(pos),
Expand Down Expand Up @@ -77,7 +77,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
}

private:
const dynamic_bitset<unsigned long long, Allocator>& _values;
const dynamic_bitset<size_t, Allocator>& _values;
const til::rect _rc;
size_t _pos;
size_t _nextPos;
Expand Down Expand Up @@ -133,7 +133,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
}
};

template<typename Allocator = std::allocator<unsigned long long>>
template<typename Allocator = std::allocator<size_t>>
class bitmap
{
public:
Expand Down Expand Up @@ -538,7 +538,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
allocator_type _alloc;
til::size _sz;
til::rect _rc;
dynamic_bitset<unsigned long long, allocator_type> _bits;
dynamic_bitset<size_t, allocator_type> _bits;

mutable std::optional<std::vector<til::rect, run_allocator_type>> _runs;

Expand All @@ -553,7 +553,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"

namespace pmr
{
using bitmap = ::til::details::bitmap<std::pmr::polymorphic_allocator<unsigned long long>>;
using bitmap = ::til::details::bitmap<std::pmr::polymorphic_allocator<size_t>>;
}
}

Expand Down
Loading