Skip to content

Commit

Permalink
more squashing
Browse files Browse the repository at this point in the history
  • Loading branch information
arahlin committed Aug 24, 2024
1 parent aaf5a11 commit 538c9a0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/include/core/G3NetworkSender.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class G3NetworkSender : public G3Module {
std::lock_guard<std::mutex> lg(lock);
// Refuse to put anything into stopped queues, and if a maximum
// queue size is set and would be exceeded, drop low priority data
if (die || (max_size && low_priority && queue.size()>=(size_t)max_size))
if (die || (max_size && low_priority && (int)queue.size()>=max_size))
return false;
queue.push_back(std::move(item));
// If the queue is shared, only one worker needs to wake up, and if
Expand Down
4 changes: 2 additions & 2 deletions core/include/core/serialization.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ struct g3frameobject_picklesuite : boost::python::pickle_suite
};

template <class T>
inline int
inline uint32_t
_g3_class_version(T *)
{
return cereal::detail::Version<T>::version;
}

#define G3_CHECK_VERSION(v) \
if ((int)v > _g3_class_version(this)) \
if ((uint32_t)v > _g3_class_version(this)) \
log_fatal("Trying to read newer class version (%d) than " \
"supported (%d). Please upgrade your software.", v, \
_g3_class_version(this));
Expand Down

0 comments on commit 538c9a0

Please sign in to comment.