From: Kirill Shcherbatov <kshcherbatov@tarantool.org> To: tarantool-patches@freelists.org, vdavydov.dev@gmail.com Cc: kostja@tarantool.org, Kirill Shcherbatov <kshcherbatov@tarantool.org> Subject: [PATCH v4 1/3] memtx: renamed memtx_tree.c to memtx_tree.cc Date: Thu, 28 Feb 2019 16:38:47 +0300 [thread overview] Message-ID: <0ab0cff40ba1bba96fe6321d276b160340ef5a92.1551360482.git.kshcherbatov@tarantool.org> (raw) In-Reply-To: <cover.1551360482.git.kshcherbatov@tarantool.org> Changed memtx_tree source extension to use C++ compiler. We need it as we going to use templates and class methods in further patches. Needed for #3961 --- src/box/CMakeLists.txt | 2 +- src/box/{memtx_tree.c => memtx_tree.cc} | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename src/box/{memtx_tree.c => memtx_tree.cc} (99%) diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt index 59e91b65a..d4d9b7aeb 100644 --- a/src/box/CMakeLists.txt +++ b/src/box/CMakeLists.txt @@ -64,7 +64,7 @@ add_library(box STATIC index_def.c iterator_type.c memtx_hash.c - memtx_tree.c + memtx_tree.cc memtx_rtree.c memtx_bitset.c engine.c diff --git a/src/box/memtx_tree.c b/src/box/memtx_tree.cc similarity index 99% rename from src/box/memtx_tree.c rename to src/box/memtx_tree.cc index 250df7f2d..9c2bcbf8e 100644 --- a/src/box/memtx_tree.c +++ b/src/box/memtx_tree.cc @@ -564,7 +564,8 @@ memtx_tree_index_create_iterator(struct index *base, enum iterator_type type, key = NULL; } - struct tree_iterator *it = mempool_alloc(&memtx->iterator_pool); + struct tree_iterator *it = + (struct tree_iterator *)mempool_alloc(&memtx->iterator_pool); if (it == NULL) { diag_set(OutOfMemory, sizeof(struct tree_iterator), "memtx_tree_index", "iterator"); -- 2.21.0
next prev parent reply other threads:[~2019-02-28 13:38 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-28 13:38 [PATCH v4 0/3] box: introduce hint option for memtx tree index Kirill Shcherbatov 2019-02-28 13:38 ` Kirill Shcherbatov [this message] 2019-02-28 13:38 ` [PATCH v4 2/3] memtx: rework memtx_tree to store arbitrary nodes Kirill Shcherbatov 2019-02-28 13:38 ` [PATCH v4 3/3] memtx: introduce tuple compare hint Kirill Shcherbatov 2019-03-06 9:41 ` [PATCH v4 0/3] box: introduce hint option for memtx tree index Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=0ab0cff40ba1bba96fe6321d276b160340ef5a92.1551360482.git.kshcherbatov@tarantool.org \ --to=kshcherbatov@tarantool.org \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH v4 1/3] memtx: renamed memtx_tree.c to memtx_tree.cc' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox