mdbx: merge branch master into devel.

src/mdbx.c++

@@ -1181,6 +1181,30 @@ bool env::is_pristine() const {
 
 bool env::is_empty() const { return get_stat().ms_leaf_pages == 0; }
 
+env &env::copy(filehandle fd, bool compactify, bool force_dynamic_size) {
+  error::success_or_throw(
+      ::mdbx_env_copy2fd(handle_, fd,
+                         (compactify ? MDBX_CP_COMPACT : MDBX_CP_DEFAULTS) |
+                             (force_dynamic_size ? MDBX_CP_FORCE_DYNAMIC_SIZE
+                                                 : MDBX_CP_DEFAULTS)));
+  return *this;
+}
+
+env &env::copy(const char *destination, bool compactify,
+               bool force_dynamic_size) {
+  error::success_or_throw(
+      ::mdbx_env_copy(handle_, destination,
+                      (compactify ? MDBX_CP_COMPACT : MDBX_CP_DEFAULTS) |
+                          (force_dynamic_size ? MDBX_CP_FORCE_DYNAMIC_SIZE
+                                              : MDBX_CP_DEFAULTS)));
+  return *this;
+}
+
+env &env::copy(const ::std::string &destination, bool compactify,
+               bool force_dynamic_size) {
+  return copy(destination.c_str(), compactify, force_dynamic_size);
+}
+
 #if defined(_WIN32) || defined(_WIN64)
 env &env::copy(const wchar_t *destination, bool compactify,
                bool force_dynamic_size) {
@@ -1198,30 +1222,6 @@ env &env::copy(const ::std::wstring &destination, bool compactify,
 }
 #endif /* Windows */
 
-env &env::copy(const char *destination, bool compactify,
-               bool force_dynamic_size) {
-  error::success_or_throw(
-      ::mdbx_env_copy(handle_, destination,
-                      (compactify ? MDBX_CP_COMPACT : MDBX_CP_DEFAULTS) |
-                          (force_dynamic_size ? MDBX_CP_FORCE_DYNAMIC_SIZE
-                                              : MDBX_CP_DEFAULTS)));
-  return *this;
-}
-
-env &env::copy(const ::std::string &destination, bool compactify,
-               bool force_dynamic_size) {
-  return copy(destination.c_str(), compactify, force_dynamic_size);
-}
-
-env &env::copy(filehandle fd, bool compactify, bool force_dynamic_size) {
-  error::success_or_throw(
-      ::mdbx_env_copy2fd(handle_, fd,
-                         (compactify ? MDBX_CP_COMPACT : MDBX_CP_DEFAULTS) |
-                             (force_dynamic_size ? MDBX_CP_FORCE_DYNAMIC_SIZE
-                                                 : MDBX_CP_DEFAULTS)));
-  return *this;
-}
-
 #ifdef MDBX_STD_FILESYSTEM_PATH
 env &env::copy(const MDBX_STD_FILESYSTEM_PATH &destination, bool compactify,
                bool force_dynamic_size) {
@@ -1233,14 +1233,25 @@ path env::get_path() const {
 #if defined(_WIN32) || defined(_WIN64)
   const wchar_t *c_wstr;
   error::success_or_throw(::mdbx_env_get_pathW(handle_, &c_wstr));
+  static_assert(sizeof(path::value_type) == sizeof(wchar_t), "Oops");
   return path(c_wstr);
 #else
   const char *c_str;
   error::success_or_throw(::mdbx_env_get_path(handle_, &c_str));
+  static_assert(sizeof(path::value_type) == sizeof(char), "Oops");
   return path(c_str);
 #endif
 }
 
+bool env::remove(const char *pathname, const remove_mode mode) {
+  return error::boolean_or_throw(
+      ::mdbx_env_delete(pathname, MDBX_env_delete_mode_t(mode)));
+}
+
+bool env::remove(const ::std::string &pathname, const remove_mode mode) {
+  return remove(pathname.c_str(), mode);
+}
+
 #if defined(_WIN32) || defined(_WIN64)
 bool env::remove(const wchar_t *pathname, const remove_mode mode) {
   return error::boolean_or_throw(
@@ -1252,15 +1263,6 @@ bool env::remove(const ::std::wstring &pathname, const remove_mode mode) {
 }
 #endif /* Windows */
 
-bool env::remove(const char *pathname, const remove_mode mode) {
-  return error::boolean_or_throw(
-      ::mdbx_env_delete(pathname, MDBX_env_delete_mode_t(mode)));
-}
-
-bool env::remove(const ::std::string &pathname, const remove_mode mode) {
-  return remove(pathname.c_str(), mode);
-}
-
 #ifdef MDBX_STD_FILESYSTEM_PATH
 bool env::remove(const MDBX_STD_FILESYSTEM_PATH &pathname,
                  const remove_mode mode) {
@@ -1304,6 +1306,42 @@ __cold void env_managed::setup(unsigned max_maps, unsigned max_readers) {
     error::success_or_throw(::mdbx_env_set_maxdbs(handle_, max_maps));
 }
 
+__cold env_managed::env_managed(const char *pathname,
+                                const operate_parameters &op, bool accede)
+    : env_managed(create_env()) {
+  setup(op.max_maps, op.max_readers);
+  error::success_or_throw(
+      ::mdbx_env_open(handle_, pathname, op.make_flags(accede), 0));
+
+  if (op.options.nested_write_transactions &&
+      !get_options().nested_write_transactions)
+    MDBX_CXX20_UNLIKELY error::throw_exception(MDBX_INCOMPATIBLE);
+}
+
+__cold env_managed::env_managed(const char *pathname,
+                                const env_managed::create_parameters &cp,
+                                const env::operate_parameters &op, bool accede)
+    : env_managed(create_env()) {
+  setup(op.max_maps, op.max_readers);
+  set_geometry(cp.geometry);
+  error::success_or_throw(::mdbx_env_open(
+      handle_, pathname, op.make_flags(accede, cp.use_subdirectory),
+      cp.file_mode_bits));
+
+  if (op.options.nested_write_transactions &&
+      !get_options().nested_write_transactions)
+    MDBX_CXX20_UNLIKELY error::throw_exception(MDBX_INCOMPATIBLE);
+}
+
+__cold env_managed::env_managed(const ::std::string &pathname,
+                                const operate_parameters &op, bool accede)
+    : env_managed(pathname.c_str(), op, accede) {}
+
+__cold env_managed::env_managed(const ::std::string &pathname,
+                                const env_managed::create_parameters &cp,
+                                const env::operate_parameters &op, bool accede)
+    : env_managed(pathname.c_str(), cp, op, accede) {}
+
 #if defined(_WIN32) || defined(_WIN64)
 __cold env_managed::env_managed(const wchar_t *pathname,
                                 const operate_parameters &op, bool accede)
@@ -1342,42 +1380,6 @@ __cold env_managed::env_managed(const ::std::wstring &pathname,
     : env_managed(pathname.c_str(), cp, op, accede) {}
 #endif /* Windows */
 
-__cold env_managed::env_managed(const char *pathname,
-                                const operate_parameters &op, bool accede)
-    : env_managed(create_env()) {
-  setup(op.max_maps, op.max_readers);
-  error::success_or_throw(
-      ::mdbx_env_open(handle_, pathname, op.make_flags(accede), 0));
-
-  if (op.options.nested_write_transactions &&
-      !get_options().nested_write_transactions)
-    MDBX_CXX20_UNLIKELY error::throw_exception(MDBX_INCOMPATIBLE);
-}
-
-__cold env_managed::env_managed(const char *pathname,
-                                const env_managed::create_parameters &cp,
-                                const env::operate_parameters &op, bool accede)
-    : env_managed(create_env()) {
-  setup(op.max_maps, op.max_readers);
-  set_geometry(cp.geometry);
-  error::success_or_throw(::mdbx_env_open(
-      handle_, pathname, op.make_flags(accede, cp.use_subdirectory),
-      cp.file_mode_bits));
-
-  if (op.options.nested_write_transactions &&
-      !get_options().nested_write_transactions)
-    MDBX_CXX20_UNLIKELY error::throw_exception(MDBX_INCOMPATIBLE);
-}
-
-__cold env_managed::env_managed(const ::std::string &pathname,
-                                const operate_parameters &op, bool accede)
-    : env_managed(pathname.c_str(), op, accede) {}
-
-__cold env_managed::env_managed(const ::std::string &pathname,
-                                const env_managed::create_parameters &cp,
-                                const env::operate_parameters &op, bool accede)
-    : env_managed(pathname.c_str(), cp, op, accede) {}
-
 #ifdef MDBX_STD_FILESYSTEM_PATH
 __cold env_managed::env_managed(const MDBX_STD_FILESYSTEM_PATH &pathname,
                                 const operate_parameters &op, bool accede)