Skip to content

Commit 1c18a5f

Browse files
committed
MSVC fixes
1 parent 50ccce4 commit 1c18a5f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

inc/smjni/java_array.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ namespace smjni
183183
return ret;
184184
}
185185
friend iterator operator+(const iterator & me, jsize dist) noexcept
186-
{ return iterator(*me->m_parent, me->m_idx + dist); }
186+
{ return iterator(*me.m_parent, me.m_idx + dist); }
187187
friend iterator operator+(jsize dist, const iterator & me) noexcept
188-
{ return iterator(*me->m_parent, me->m_idx + dist); }
188+
{ return iterator(*me.m_parent, me.m_idx + dist); }
189189
friend iterator operator-(const iterator & me, jsize dist) noexcept
190-
{ return iterator(*me->m_parent, me->m_idx - dist); }
190+
{ return iterator(*me.m_parent, me.m_idx - dist); }
191191
friend jsize operator-(const iterator & lhs, const iterator & rhs) noexcept
192192
{ return lhs.m_idx - rhs.m_idx; }
193193

@@ -274,11 +274,11 @@ namespace smjni
274274
return ret;
275275
}
276276
friend const_iterator operator+(const const_iterator & me, jsize dist) noexcept
277-
{ return const_iterator(*me->m_parent, me->m_idx + dist); }
277+
{ return const_iterator(*me.m_parent, me.m_idx + dist); }
278278
friend const_iterator operator+(jsize dist, const const_iterator & me) noexcept
279-
{ return const_iterator(*me->m_parent, me->m_idx + dist); }
279+
{ return const_iterator(*me.m_parent, me.m_idx + dist); }
280280
friend const_iterator operator-(const const_iterator & me, jsize dist) noexcept
281-
{ return const_iterator(*me->m_parent, me->m_idx - dist); }
281+
{ return const_iterator(*me.m_parent, me.m_idx - dist); }
282282
friend jsize operator-(const const_iterator & lhs, const const_iterator & rhs) noexcept
283283
{ return lhs.m_idx - rhs.m_idx; }
284284

tests/src/cpp/array_tests.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
#include <doctest.h>
2020

2121
#include <vector>
22+
#include <array>
2223
#include <iterator>
24+
#include <algorithm>
2325

2426
using namespace smjni;
2527

0 commit comments

Comments
 (0)