diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-09-05 02:10:12 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-09-05 02:10:12 +0000 |
| commit | dffdaab0c8a9fadd083d0d6967231c97fb1ad053 (patch) | |
| tree | 81afa9b1a91daf1eb6d5ca685f161eab0f219a06 /databases/rocksdb | |
| parent | 6c8595c843ebf01b6d0e6f4f0dad4063a766b667 (diff) | |
| download | ports-dffdaab0c8a9fadd083d0d6967231c97fb1ad053.tar.gz ports-dffdaab0c8a9fadd083d0d6967231c97fb1ad053.zip | |
databases/rocksdb: Fix build on i386
utilities/transactions/pessimistic_transaction.cc:691:25: error: implicit conversion from 'type' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion]
: std::numeric_limits<uint64_t>::max();
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
utilities/transactions/pessimistic_transaction.cc:766:23: error: implicit conversion from 'type' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion]
: std::numeric_limits<uint64_t>::max();
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
Diffstat (limited to 'databases/rocksdb')
| -rw-r--r-- | databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc b/databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc new file mode 100644 index 000000000000..1eb9de9bfafc --- /dev/null +++ b/databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc @@ -0,0 +1,20 @@ +--- utilities/transactions/pessimistic_transaction.cc.orig 2023-09-01 20:58:39 UTC ++++ utilities/transactions/pessimistic_transaction.cc +@@ -688,7 +688,7 @@ Status WriteCommittedTxn::CommitWithoutPrepareInternal + const Comparator* ucmp = + WriteBatchWithIndexInternal::GetUserComparator(*wbwi, cf); + return ucmp ? ucmp->timestamp_size() +- : std::numeric_limits<uint64_t>::max(); ++ : std::numeric_limits<size_t>::max(); + }); + if (!s.ok()) { + return s; +@@ -763,7 +763,7 @@ Status WriteCommittedTxn::CommitInternal() { + const Comparator* ucmp = + WriteBatchWithIndexInternal::GetUserComparator(*wbwi, cf); + return ucmp ? ucmp->timestamp_size() +- : std::numeric_limits<uint64_t>::max(); ++ : std::numeric_limits<size_t>::max(); + }); + } + } |