Commit 95caa12b authored by Baptiste Esteban's avatar Baptiste Esteban
Browse files

Solve Windows loss conversion errors

parent 52bf9a6d
Pipeline #28162 passed with stage
in 32 minutes and 58 seconds
......@@ -46,7 +46,7 @@ namespace mln::morpho
requires(std::is_integral_v<W>&& std::is_unsigned_v<W> && sizeof(W) <= 2) class alphatree_edges<P, N, W>
{
public:
void push(std::size_t dir, W w, P p) { m_cont.insert(dir, w, p); }
void push(int dir, W w, P p) { m_cont.insert(dir, w, p); }
std::tuple<P, P, W> pop() { return m_cont.pop(); }
W top() const { return m_cont.current_level(); }
bool empty() const { return m_cont.empty(); }
......@@ -68,7 +68,7 @@ namespace mln::morpho
class alphatree_edges
{
public:
void push(std::size_t dir, W w, P p) { m_cont.push_back({p, p + cn.after_offsets()[dir], w}); }
void push(int dir, W w, P p) { m_cont.push_back({p, p + cn.after_offsets()[dir], w}); }
std::tuple<P, P, W> pop()
{
assert(m_current < m_cont.size());
......@@ -156,7 +156,7 @@ namespace mln::morpho
auto dom = input.domain();
mln_foreach (auto p, dom)
{
std::size_t i = 0;
int i = 0;
for (auto n : nbh.after(p))
{
if (dom.has(n))
......
......@@ -40,7 +40,7 @@ namespace mln::morpho::details
static_assert(sizeof(K) <= 2, "Key should have a size of at least 2");
private:
static constexpr std::size_t m_ndir = decltype(N::after_offsets())::extent;
static constexpr int m_ndir = decltype(N::after_offsets())::extent;
static constexpr int m_nlevels = 1 << std::numeric_limits<K>::digits;
queue_type m_queues[m_ndir];
......@@ -88,8 +88,8 @@ namespace mln::morpho::details
if (m_size > 0 && m_queues[m_current_dir].empty(m_current_level))
{
int lvl = m_queues[0].lower_bound(m_current_level);
std::size_t dir = 0;
for (std::size_t i = 1; i < m_ndir; i++)
int dir = 0;
for (int i = 1; i < m_ndir; i++)
{
int tmp = m_queues[i].lower_bound(m_current_level);
if (tmp < lvl && tmp < m_nlevels)
......
......@@ -29,7 +29,7 @@ TEST(Morpho, DirectionalHQueueC4)
mln_foreach (auto p, ima.domain())
{
std::size_t i = 0;
int i = 0;
for (auto q : mln::c4.after(p))
{
if (ima.domain().has(q))
......@@ -69,7 +69,7 @@ TEST(Morpho, DirectionalHQueueC8)
mln_foreach (auto p, ima.domain())
{
std::size_t i = 0;
int i = 0;
for (auto q : mln::c8.after(p))
{
if (ima.domain().has(q))
......@@ -113,7 +113,7 @@ TEST(Morpho, DirectionalHQueueC6)
mln_foreach (auto p, ima.domain())
{
std::size_t i = 0;
int i = 0;
for (auto q : mln::c6.after(p))
{
if (ima.domain().has(q))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment