Skip to content

Commit 6414959

Browse files
committed
MDEV-7526: TokuDB doesn't build on OS X
This patch fixes another compilation error caused by specifying attribute nonnull for all the parameters of the copyout function. This is incorrect as the function actually gets called with null parameters indirectly and thus only the output parameter should be nonnull.
1 parent f89c9fc commit 6414959

File tree

1 file changed

+4
-4
lines changed
  • storage/tokudb/ft-index/util

1 file changed

+4
-4
lines changed

storage/tokudb/ft-index/util/dmt.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -679,16 +679,16 @@ class dmt {
679679
__attribute__((nonnull))
680680
void rebalance(subtree *const subtree);
681681

682-
__attribute__((nonnull))
682+
__attribute__((nonnull(3)))
683683
static void copyout(uint32_t *const outlen, dmtdata_t *const out, const dmt_node *const n);
684684

685-
__attribute__((nonnull))
685+
__attribute__((nonnull(3)))
686686
static void copyout(uint32_t *const outlen, dmtdata_t **const out, dmt_node *const n);
687687

688-
__attribute__((nonnull))
688+
__attribute__((nonnull(4)))
689689
static void copyout(uint32_t *const outlen, dmtdata_t *const out, const uint32_t len, const dmtdata_t *const stored_value_ptr);
690690

691-
__attribute__((nonnull))
691+
__attribute__((nonnull(4)))
692692
static void copyout(uint32_t *const outlen, dmtdata_t **const out, const uint32_t len, dmtdata_t *const stored_value_ptr);
693693

694694
template<typename dmtcmp_t,

0 commit comments

Comments
 (0)