From 802893d02b7b56c7194cb0c41408cb995930f900 Mon Sep 17 00:00:00 2001 From: Dennis Zhou Date: Wed, 7 Sep 2022 17:42:23 -0700 Subject: [PATCH] FutureBool: fix bool -> fdb_bool_t Honestly, this might not be an issue, but it's nice to be consistent with the conversions across c++ -> c for bool type. --- fdbclient/MultiVersionTransaction.actor.cpp | 4 ++-- fdbclient/include/fdbclient/MultiVersionTransaction.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp index f84bcdf974..03f7388476 100644 --- a/fdbclient/MultiVersionTransaction.actor.cpp +++ b/fdbclient/MultiVersionTransaction.actor.cpp @@ -652,7 +652,7 @@ ThreadFuture DLDatabase::blobbifyRange(const KeyRangeRef& keyRange) { db, keyRange.begin.begin(), keyRange.begin.size(), keyRange.end.begin(), keyRange.end.size()); return toThreadFuture(api, f, [](FdbCApi::FDBFuture* f, FdbCApi* api) { - bool ret = false; + FdbCApi::fdb_bool_t ret = false; ASSERT(!api->futureGetBool(f, &ret)); return ret; }); @@ -667,7 +667,7 @@ ThreadFuture DLDatabase::unblobbifyRange(const KeyRangeRef& keyRange) { db, keyRange.begin.begin(), keyRange.begin.size(), keyRange.end.begin(), keyRange.end.size()); return toThreadFuture(api, f, [](FdbCApi::FDBFuture* f, FdbCApi* api) { - bool ret = false; + FdbCApi::fdb_bool_t ret = false; ASSERT(!api->futureGetBool(f, &ret)); return ret; }); diff --git a/fdbclient/include/fdbclient/MultiVersionTransaction.h b/fdbclient/include/fdbclient/MultiVersionTransaction.h index 0cb9b97c51..c4748fe248 100644 --- a/fdbclient/include/fdbclient/MultiVersionTransaction.h +++ b/fdbclient/include/fdbclient/MultiVersionTransaction.h @@ -368,7 +368,7 @@ struct FdbCApi : public ThreadSafeReferenceCounted { fdb_error_t (*futureGetDatabase)(FDBFuture* f, FDBDatabase** outDb); fdb_error_t (*futureGetInt64)(FDBFuture* f, int64_t* outValue); fdb_error_t (*futureGetUInt64)(FDBFuture* f, uint64_t* outValue); - fdb_error_t (*futureGetBool)(FDBFuture* f, bool* outValue); + fdb_error_t (*futureGetBool)(FDBFuture* f, fdb_bool_t* outValue); fdb_error_t (*futureGetError)(FDBFuture* f); fdb_error_t (*futureGetKey)(FDBFuture* f, uint8_t const** outKey, int* outKeyLength); fdb_error_t (*futureGetValue)(FDBFuture* f, fdb_bool_t* outPresent, uint8_t const** outValue, int* outValueLength);