Skip to content

Commit

Permalink
Fix shorten-64-to-32 warning
Browse files Browse the repository at this point in the history
Change-Id: Ief3c1b7b40e4c2d9188c3d1993404f503eba232e
  • Loading branch information
jedelbo committed Oct 21, 2019
1 parent 6d7443b commit 14028b8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/realm/query_expression.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,7 @@ class SimpleQuerySupport : public Subexpr2<T> {

auto sz = result.size();
for (size_t i = 0; i < sz; i++) {
auto ndxs = m_link_map.get_origin_ndxs(result.get(i));
auto ndxs = m_link_map.get_origin_ndxs(size_t(result.get(i)));
ret.insert(ret.end(), ndxs.begin(), ndxs.end());
}
result.destroy();
Expand Down Expand Up @@ -3252,7 +3252,7 @@ class Columns : public Subexpr2<T> {

auto sz = result.size();
for (size_t i = 0; i < sz; i++) {
auto ndxs = m_link_map.get_origin_ndxs(result.get(i));
auto ndxs = m_link_map.get_origin_ndxs(size_t(result.get(i)));
ret.insert(ret.end(), ndxs.begin(), ndxs.end());
}
result.destroy();
Expand Down
2 changes: 1 addition & 1 deletion src/realm/util/file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ void File::prealloc(size_t size)
// We need to prevent concurrent calls to lseek from the encryption layer
// while we're writing to the file to extend it. Otherwise an intervening
// lseek may redirect the writing process, causing file corruption.
UniqueLock lock(util::mapping_mutex);
UniqueLock lck(util::mapping_mutex);
manually_consume_space();
}
else {
Expand Down

0 comments on commit 14028b8

Please sign in to comment.