Skip to content

Commit 8bc6254

Browse files
erthinkerthink
committed
fpta: update libmdbx to 0.11.2.15
1 parent 65da81b commit 8bc6254

14 files changed

Lines changed: 30 additions & 25 deletions

File tree

‎externals/libmdbx/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ if(NOT DEFINED MDBX_CXX_STANDARD)
349349
AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12))
350350
set(MDBX_CXX_STANDARD 23)
351351
elseif(NOT HAS_CXX20 LESS 0
352-
AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9))
352+
AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10))
353353
set(MDBX_CXX_STANDARD 20)
354354
elseif(NOT HAS_CXX17 LESS 0
355355
AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5))

‎externals/libmdbx/ChangeLog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ Acknowledgements:
2424

2525
- [gcxfd <i@rmw.link>](https://github.com/gcxfd) for reporting, contributing and testing.
2626

27+
Fixes:
28+
29+
- Disabled C++20 concepts for stupid AppleClang 13.x
30+
2731
Minors:
2832

2933
- Fixed returning `MDBX_RESULT_TRUE` (-1) from `mdbx_env_set_option()`.

‎externals/libmdbx/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
> Please refer to the online [documentation](https://erthink.github.io/libmdbx/)
44
> with [`C` API description](https://erthink.github.io/libmdbx/group__c__api.html)
5-
> and pay attention to the preliminary [`C++` API](https://github.com/erthink/libmdbx/blob/devel/mdbx.h%2B%2B).
5+
> and pay attention to the [`C++` API](https://github.com/erthink/libmdbx/blob/devel/mdbx.h%2B%2B).
66
>
77
> Questions, feedback and suggestions are welcome to the [Telegram' group](https://t.me/libmdbx).
88
>

‎externals/libmdbx/VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.2.11
1+
0.11.2.15

‎externals/libmdbx/cmake/compiler.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ if(NOT DEFINED CMAKE_TARGET_BITNESS)
178178
endif()
179179
endif()
180180

181-
if(CMAKE_COMPILER_IS_ELBRUSC OR CMAKE_SYSTEM_PROCESSOR MATCHES "e2k.*|E2K.*|elbrus.*|ELBRUS.*")
181+
if(CMAKE_COMPILER_IS_ELBRUSC OR CMAKE_COMPILER_IS_ELBRUSCXX OR CMAKE_SYSTEM_PROCESSOR MATCHES "e2k.*|E2K.*|elbrus.*|ELBRUS.*")
182182
set(E2K TRUE)
183183
set(CMAKE_SYSTEM_ARCH "Elbrus")
184184
elseif((MSVC64 OR MINGW64) AND CMAKE_TARGET_BITNESS EQUAL 64)
@@ -271,7 +271,7 @@ if(CMAKE_CXX_COMPILER_LOADED)
271271
endif()
272272

273273
# Check for LTO support by GCC
274-
if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG})
274+
if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG} AND NOT CMAKE_COMPILER_IS_ELBRUSC AND NOT CMAKE_COMPILER_IS_ELBRUSCXX)
275275
unset(gcc_collect)
276276
unset(gcc_lto_wrapper)
277277

‎externals/libmdbx/mdbx.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* <http://www.OpenLDAP.org/license.html>. */
1313

1414
#define xMDBX_ALLOY 1
15-
#define MDBX_BUILD_SOURCERY de4f6e694cfe431787b332d512abb16e80067d60f9f3911ff48c5c7f25e6e1f1_v0_11_2_11_gdf6b9028
15+
#define MDBX_BUILD_SOURCERY c5b9a3e9ba7c98987e7554f0c84c1e12e9f82d0d470ad881d54923ecf3599c17_v0_11_2_15_gca197965
1616
#ifdef MDBX_CONFIG_H
1717
#include MDBX_CONFIG_H
1818
#endif
@@ -28535,9 +28535,9 @@ __dll_export
2853528535
0,
2853628536
11,
2853728537
2,
28538-
11,
28539-
{"2021-12-08T03:25:46+03:00", "9e9997141d2c180207c17a5cadaa100442d3264f", "df6b9028ecd2cf950d34f2d1e0cdf3ace59fe122",
28540-
"v0.11.2-11-gdf6b9028"},
28538+
15,
28539+
{"2021-12-09T15:54:16+03:00", "b9a59a0f8051a9596747d2cdc7b4dd9f07ffea68", "ca19796514122e7980cb42c9cf9aeccb0e544705",
28540+
"v0.11.2-15-gca197965"},
2854128541
sourcery};
2854228542

2854328543
__dll_export

‎externals/libmdbx/mdbx.c++‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* <http://www.OpenLDAP.org/license.html>. */
1313

1414
#define xMDBX_ALLOY 1
15-
#define MDBX_BUILD_SOURCERY de4f6e694cfe431787b332d512abb16e80067d60f9f3911ff48c5c7f25e6e1f1_v0_11_2_11_gdf6b9028
15+
#define MDBX_BUILD_SOURCERY c5b9a3e9ba7c98987e7554f0c84c1e12e9f82d0d470ad881d54923ecf3599c17_v0_11_2_15_gca197965
1616
#ifdef MDBX_CONFIG_H
1717
#include MDBX_CONFIG_H
1818
#endif
@@ -3372,7 +3372,7 @@ MDBX_MAYBE_UNUSED static void static_checks(void) {
33723372
// Copyright (c) 2020-2021, Leonid Yuriev <leo@yuriev.ru>.
33733373
// SPDX-License-Identifier: Apache-2.0
33743374
//
3375-
// Non-inline part of the libmdbx C++ API (preliminary)
3375+
// Non-inline part of the libmdbx C++ API
33763376
//
33773377

33783378
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)

‎externals/libmdbx/mdbx.h++‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/// \file mdbx.h++
2-
/// \brief The libmdbx C++ API header file (preliminary).
2+
/// \brief The libmdbx C++ API header file.
33
///
44
/// \author Copyright (c) 2020-2021, Leonid Yuriev <leo@yuriev.ru>.
55
/// \copyright SPDX-License-Identifier: Apache-2.0
66
///
77
/// Tested with:
8-
/// - LCC >= 1.23 (http://www.mcst.ru/lcc),
9-
/// - GNU C++ >= 4.8,
10-
/// - clang >= 4.0,
11-
/// - MSVC >= 19.0 (Visual Studio 2015),
12-
/// but 19.2x could hang due optimizer bug.
8+
/// - Elbrus LCC >= 1.23 (http://www.mcst.ru/lcc);
9+
/// - GNU C++ >= 4.8;
10+
/// - clang >= 3.9;
11+
/// - MSVC >= 14.0 (Visual Studio 2015),
12+
/// but 19.2x could hang due optimizer bug;
13+
/// - AppleClang, but without C++20 concepts.
1314
///
1415

1516
#pragma once
@@ -19,7 +20,7 @@
1920
#error "C++11 compiler or better is required"
2021
#elif _MSC_VER >= 1910
2122
#error \
22-
"Please add ` /Zc:__cplusplus` to MSVC compiler options to enforce it conform ISO C++"
23+
"Please add `/Zc:__cplusplus` to MSVC compiler options to enforce it conform ISO C++"
2324
#endif /* MSVC is mad and don't define __cplusplus properly */
2425
#endif /* __cplusplus < 201103L */
2526

@@ -3949,7 +3950,7 @@ inline ::std::ostream &operator<<(::std::ostream &out,
39493950

39503951
//==============================================================================
39513952
//
3952-
// Inline body of the libmdbx C++ API (preliminary draft)
3953+
// Inline body of the libmdbx C++ API
39533954
//
39543955

39553956
MDBX_CXX11_CONSTEXPR const version_info &get_version() noexcept {

‎externals/libmdbx/mdbx_chk.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* top-level directory of the distribution or, alternatively, at
3535
* <http://www.OpenLDAP.org/license.html>. */
3636

37-
#define MDBX_BUILD_SOURCERY de4f6e694cfe431787b332d512abb16e80067d60f9f3911ff48c5c7f25e6e1f1_v0_11_2_11_gdf6b9028
37+
#define MDBX_BUILD_SOURCERY c5b9a3e9ba7c98987e7554f0c84c1e12e9f82d0d470ad881d54923ecf3599c17_v0_11_2_15_gca197965
3838
#ifdef MDBX_CONFIG_H
3939
#include MDBX_CONFIG_H
4040
#endif

‎externals/libmdbx/mdbx_copy.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* top-level directory of the distribution or, alternatively, at
3535
* <http://www.OpenLDAP.org/license.html>. */
3636

37-
#define MDBX_BUILD_SOURCERY de4f6e694cfe431787b332d512abb16e80067d60f9f3911ff48c5c7f25e6e1f1_v0_11_2_11_gdf6b9028
37+
#define MDBX_BUILD_SOURCERY c5b9a3e9ba7c98987e7554f0c84c1e12e9f82d0d470ad881d54923ecf3599c17_v0_11_2_15_gca197965
3838
#ifdef MDBX_CONFIG_H
3939
#include MDBX_CONFIG_H
4040
#endif

0 commit comments

Comments
 (0)