Skip to content

Commit 36a0f4c

Browse files
committed
CBD-6348: Changes needed for gcc-13.2
Change-Id: Iae4c1e08d0e50c42d57fbedcfd8e5a9aa4e36eed Reviewed-on: https://review.couchbase.org/c/kv_engine/+/234563 Reviewed-by: Vesko Karaganev <[email protected]> Tested-by: Trond Norbye <[email protected]> Well-Formed: Restriction Checker
1 parent 2659273 commit 36a0f4c

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

daemon/protocol/mcbp/get_cmd_timer_executor.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static std::pair<cb::engine_errc, Hdr1sfMicroSecHistogram> get_timings(
3333
// Don't create a new privilege context if the one we've got is for the
3434
// connected bucket:
3535
auto& connection = cookie.getConnection();
36-
if (bucket.name == connection.getBucket().name) {
36+
if (strcmp(bucket.name, connection.getBucket().name) == 0) {
3737
auto ret = mcbp::checkPrivilege(cookie,
3838
cb::rbac::Privilege::SimpleStats);
3939
if (ret != cb::engine_errc::success) {

engines/ep/src/dcp/passive_stream.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ cb::engine_errc PassiveStream::processMessage(MutationConsumerMessage* message,
657657
message->getItem()->setCas();
658658
}
659659

660-
cb::engine_errc ret;
660+
cb::engine_errc ret = cb::engine_errc::failed;
661661
DeleteSource deleteSource = DeleteSource::Explicit;
662662
bool switchComplete = false;
663663
switch (messageType) {

engines/ep/tests/mock/mock_kvstore.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ MockKVStore::MockKVStore(std::unique_ptr<KVStoreIface> real)
5151
ON_CALL(*this, getAggrDbFileInfo()).WillByDefault([this]() {
5252
return this->realKVS->getAggrDbFileInfo();
5353
});
54-
ON_CALL(*this, getConfig()).WillByDefault([this]() {
54+
ON_CALL(*this, getConfig()).WillByDefault([this]() -> const auto& {
5555
return this->realKVS->getConfig();
5656
});
5757
ON_CALL(*this, snapshotVBucket(_, _))

include/mcbp/protocol/opcode.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <iosfwd>
1414
#include <string>
15+
#include <cstdint>
1516

1617
namespace cb::mcbp {
1718

0 commit comments

Comments
 (0)