From d6b9b054c22cca62188310fc6d13d9499389b986 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Mon, 3 Oct 2022 22:34:13 +0200 Subject: [PATCH] Fix emplace generation (incorrect value oplist) --- m-bptree.h | 2 +- m-core.h | 2 +- m-dict.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m-bptree.h b/m-bptree.h index 0900b4bd..071a3133 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -1468,7 +1468,7 @@ } \ , /* no in_serial */ ) \ \ - M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF(M_INV(isMap), name, tree_t, key_oplist, val_oplist) + M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF(M_INV(isMap), name, tree_t, key_oplist, value_oplist) #if M_USE_SMALL_NAME #define BPTREE_DEF2 M_BPTREE_DEF2 diff --git a/m-core.h b/m-core.h index c6a602bb..8141c8d7 100644 --- a/m-core.h +++ b/m-core.h @@ -4480,7 +4480,7 @@ m_core_parse2_enum (const char str[], const char **endptr) #define M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF(isSet, name, name_t, key_oplist, val_oplist) \ M_C(M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF, isSet)(name, name_t, key_oplist, val_oplist) #define M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF0(name, name_t, key_oplist, val_oplist) \ - M_EMPLACE_ASS_ARRAY_DEF(name, name_t, M_C(name, _emplace), key_oplist, value_type, M_EMPLACE_ASS_ARRA1_BOTH_GENE, M_EMPLACE_ASS_ARRA1_KEY_GENE, M_EMPLACE_ASS_ARRA1_VAL_GENE) + M_EMPLACE_ASS_ARRAY_DEF(name, name_t, M_C(name, _emplace), key_oplist, val_oplist, M_EMPLACE_ASS_ARRA1_BOTH_GENE, M_EMPLACE_ASS_ARRA1_KEY_GENE, M_EMPLACE_ASS_ARRA1_VAL_GENE) #define M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF1(name, name_t, key_oplist, val_oplist) \ M_EMPLACE_QUEUE_DEF(name, name_t, M_C(name, _emplace), key_oplist, M_EMPLACE_QUEUE_GENE) diff --git a/m-dict.h b/m-dict.h index 49ad069e..681bc84d 100644 --- a/m-dict.h +++ b/m-dict.h @@ -1035,7 +1035,7 @@ } \ , /* NO UPDATE */) ) \ \ - M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF(isSet, name, dict_t, key_oplist, val_oplist) + M_EMPLACE_ASS_ARRAY_OR_QUEUE_DEF(isSet, name, dict_t, key_oplist, value_oplist) /* Deferred evaluation for the definition, so that all arguments are evaluated before further expansion */