diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5ac003..3f8717b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -X.Y.Z Release notes (YYYY-MM-DD) +1.1.0 Release notes (2024-03-26) ============================================================= ### Fixed @@ -13,6 +13,7 @@ X.Y.Z Release notes (YYYY-MM-DD) * Add `managed>::as_results()` to allow the ability to derive a `realm::results<>` collection from a managed vector. * Allow a `realm::uuid` to be constructed with `std::array`. * Add support for integrating `cpprealm` with the Conan package manager. +* Add support for integrating `cpprealm` with the vcpkg package manager. * Add BSON support for `user::call_function` and `user::get_custom_data` API's. * Add `user::get_custom_data()` and deprecate `user::custom_data()`. diff --git a/Package.swift b/Package.swift index b4df1dcb..2f37dd73 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription -let sdkVersion = Version("1.0.0") +let sdkVersion = Version("1.1.0") let coreVersion = Version("14.4.1") var cxxSettings: [CXXSetting] = [ diff --git a/conanfile.py b/conanfile.py index 81a40e70..38c16658 100644 --- a/conanfile.py +++ b/conanfile.py @@ -36,7 +36,7 @@ def source(self): git = Git(self) git.clone(url="https://github.com/realm/realm-cpp", target=".") git.folder = "." - git.checkout(commit="c1096b169258581927fa1591686bdc1687f368ed") + git.checkout(commit="ae8e8af6dd201095742ed476834b034fbc51776d") git.run("submodule update --init --recursive") def layout(self): diff --git a/dependencies.list b/dependencies.list index 4ff12689..01110581 100644 --- a/dependencies.list +++ b/dependencies.list @@ -1 +1 @@ -VERSION=1.0.0 \ No newline at end of file +VERSION=1.1.0 \ No newline at end of file diff --git a/src/cpprealm/bson.cpp b/src/cpprealm/bson.cpp index c350fd6d..4b301f21 100644 --- a/src/cpprealm/bson.cpp +++ b/src/cpprealm/bson.cpp @@ -29,7 +29,7 @@ namespace realm { bsoncxx::bsoncxx(const bsoncxx& v) noexcept { #ifdef CPPREALM_HAVE_GENERATED_BRIDGE_TYPES - *reinterpret_cast(&m_bson) = *reinterpret_cast(&v.m_bson); + new (&m_bson) bson::Bson(*reinterpret_cast(&v.m_bson)); #else m_bson = v.m_bson; #endif @@ -38,7 +38,7 @@ namespace realm { bsoncxx::bsoncxx(bsoncxx&& v) noexcept { #ifdef CPPREALM_HAVE_GENERATED_BRIDGE_TYPES - *reinterpret_cast(&m_bson) = std::move(*reinterpret_cast(&v.m_bson)); + new (&m_bson) bson::Bson(std::move(*reinterpret_cast(&v.m_bson))); #else m_bson = std::move(v.m_bson); #endif