Skip to content

Commit 8e636bb

Browse files
committed
Compilation warning on sign-conversion. See issue #6 on github.
1 parent a47ea52 commit 8e636bb

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

include/comms/field/adapter/SequenceTerminationFieldSuffix.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,16 @@ class SequenceTerminationFieldSuffix : public TBase
163163
template <typename TIter, typename... TParams>
164164
comms::ErrorStatus readInternal(TIter& iter, std::size_t len, RawDataTag<TParams...>)
165165
{
166+
using IterType = typename std::decay<decltype(iter)>::type;
167+
using DiffType = typename std::iterator_traits<IterType>::difference_type;
168+
166169
std::size_t consumed = 0U;
167170
std::size_t termFieldLen = 0U;
168171
while (consumed < len) {
169-
auto iterCpy = iter + consumed;
172+
auto iterCpy = iter + static_cast<DiffType>(consumed);
170173
auto es = m_termField.read(iterCpy, len - consumed);
171174
if (es == comms::ErrorStatus::Success) {
172-
termFieldLen = static_cast<std::size_t>(std::distance(iter + consumed, iterCpy));
175+
termFieldLen = static_cast<std::size_t>(std::distance(iter + static_cast<DiffType>(consumed), iterCpy));
173176
break;
174177
}
175178

include/comms/field/basic/ArrayList.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,9 @@ class ArrayList :
673673
template <typename TIter, typename... TParams>
674674
ErrorStatus readInternal(TIter& iter, std::size_t len, RawDataTag<TParams...>)
675675
{
676-
comms::util::assign(value(), iter, iter + std::min(len, comms::util::maxSizeOf(value())));
676+
using IterType = typename std::decay<decltype(iter)>::type;
677+
using DiffType = typename std::iterator_traits<IterType>::difference_type;
678+
comms::util::assign(value(), iter, iter + static_cast<DiffType>(std::min(len, comms::util::maxSizeOf(value()))));
677679
std::advance(iter, len);
678680
return ErrorStatus::Success;
679681
}

0 commit comments

Comments
 (0)