Skip to content

Commit

Permalink
Merge pull request #12775 from fowles/23.x
Browse files Browse the repository at this point in the history
fix: avoid warnings with MSVC (#12762)
  • Loading branch information
fowles authored May 12, 2023
2 parents 0ce78c6 + e034aad commit b0e0c59
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/google/protobuf/has_bits.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class HasBits {
}

void Or(const HasBits<doublewords>& rhs) {
for (size_t i = 0; i < doublewords; i++) has_bits_[i] |= rhs[i];
for (size_t i = 0; i < doublewords; i++) has_bits_[i] |= rhs.has_bits_[i];
}

bool empty() const;
Expand Down
7 changes: 4 additions & 3 deletions src/google/protobuf/string_block.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,11 @@ inline size_t StringBlock::NextSize(StringBlock* block) {
}

inline StringBlock* StringBlock::Emplace(void* p, size_t n, StringBlock* next) {
ABSL_DCHECK_EQ(n, NextSize(next));
uint32_t doubled = static_cast<uint32_t>(n) * 2;
const auto count = static_cast<uint32_t>(n);
ABSL_DCHECK_EQ(count, NextSize(next));
uint32_t doubled = count * 2;
uint32_t next_size = next ? std::min(doubled, max_size()) : min_size();
return new (p) StringBlock(next, false, RoundedSize(n), next_size);
return new (p) StringBlock(next, false, RoundedSize(count), next_size);
}

inline StringBlock* StringBlock::New(StringBlock* next) {
Expand Down

0 comments on commit b0e0c59

Please sign in to comment.