Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbf31ba8

Browse files
authored
Merge pull request#259 from LLNL/hotfix/0.23.1
Hotfix/0.23.1
2 parents2a4c78a +c0a560a commitbf31ba8

File tree

8 files changed

+25
-13
lines changed

8 files changed

+25
-13
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ endif()
1717
# Metall general configuration
1818
# -------------------------------------------------------------------------------- #
1919
project(Metall
20-
VERSION0.23
20+
VERSION0.23.1
2121
DESCRIPTION"A persistent memory allocator for data-centric analytics"
2222
HOMEPAGE_URL"https://github.com/LLNL/metall")
2323

‎docs/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Metall"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v0.23
41+
PROJECT_NUMBER = v0.23.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎example/container/string_key_store.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,20 @@ void json_store_example() {
5555
constuint64_t hash_seed =123;
5656
auto *store = manager.construct<json_store_type>("json-store")(unique, hash_seed, manager.get_allocator());
5757

58-
store->insert("a",
59-
mj::parse(R"({"name":"Alice"})", manager.get_allocator()));
58+
store->insert("a");// Insert with only key.
6059

6160
store->insert("b",
6261
mj::parse(R"({"name":"N/A"})", manager.get_allocator()));
6362
store->insert("b",
64-
mj::parse(R"({"name":"Bob"})", manager.get_allocator()));// Overwrite
63+
mj::parse(R"({"name":"Alice"})", manager.get_allocator()));// Overwrite
6564
}
6665

6766
{
6867
metall::managermanager(metall::open_read_only,"./string_key_store_obj");
6968
auto *store = manager.find<json_store_type>("json-store").first;
7069

71-
// Use find() to locateelements.
70+
// Use find() to locatean element.
7271
std::cout <<"a :" <<mj::serialize(store->value(store->find("a"))) << std::endl;
7372
std::cout <<"b :" <<mj::serialize(store->value(store->find("b"))) << std::endl;
74-
}
73+
}
7574
}

‎include/metall/container/experimental/json/array.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@ class array {
5050
using iterator =typename array_type::iterator;
5151
using const_iterator =typename array_type::const_iterator;
5252

53+
/// \brief Constructor
54+
array() =default;
55+
5356
/// \brief Constructor.
5457
/// \param alloc An allocator object.
55-
explicitarray(const allocator_type &alloc = allocator_type())
58+
explicitarray(const allocator_type &alloc)
5659
: m_array(alloc) {}
5760

5861
/// \brief Copy constructor

‎include/metall/container/experimental/json/compact_object.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,12 @@ class compact_object {
6969
using iterator =typename value_storage_type::iterator;
7070
using const_iterator =typename value_storage_type::const_iterator;
7171

72+
/// \brief Constructor.
73+
compact_object() {}
74+
7275
/// \brief Constructor.
7376
/// \param alloc An allocator object.
74-
explicitcompact_object(const allocator_type &alloc = allocator_type())
77+
explicitcompact_object(const allocator_type &alloc)
7578
: m_value_storage(alloc) {}
7679

7780
/// \brief Copy constructor

‎include/metall/container/experimental/json/indexed_object.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace jsndtl {
3030
/// \brief Provides 'equal' calculation for other object types that have the same interface as the object class.
3131
template<typename allocator_type,typename other_object_type>
3232
inlineboolgeneral_indexed_object_equal(const indexed_object<allocator_type> &object,
33-
const other_object_type &other_object)noexcept {
33+
const other_object_type &other_object)noexcept {
3434
if (object.size() != other_object.size())returnfalse;
3535

3636
for (constauto &key_value: object) {
@@ -80,9 +80,12 @@ class indexed_object {
8080
using iterator =typename value_storage_type::iterator;
8181
using const_iterator =typename value_storage_type::const_iterator;
8282

83+
/// \brief Constructor.
84+
indexed_object() {}
85+
8386
/// \brief Constructor.
8487
/// \param alloc An allocator object.
85-
explicitindexed_object(const allocator_type &alloc = allocator_type())
88+
explicitindexed_object(const allocator_type &alloc)
8689
: m_index_table(alloc),
8790
m_value_storage(alloc) {}
8891

‎include/metall/container/experimental/json/value.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,13 @@ class value {
8181
object_type, array_type, string_type>;
8282

8383
public:
84+
85+
/// \brief Constructor.
86+
value() {}
87+
8488
/// \brief Constructor.
8589
/// \param alloc An allocator object.
86-
explicitvalue(const allocator_type &alloc = allocator_type())
90+
explicitvalue(const allocator_type &alloc)
8791
: m_allocator(alloc),
8892
m_data(null_type()) {}
8993

‎include/metall/version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// METALL_VERSION / 100 % 1000 // the minor version.
1515
/// METALL_VERSION % 100 // the patch level.
1616
/// \endcode
17-
#defineMETALL_VERSION2300
17+
#defineMETALL_VERSION2301
1818

1919
namespacemetall {
2020
/// \brief Variable type to handle a version data.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp