Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RCPP-62 Prepare v1.1.0 release #187

Merged
merged 4 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
X.Y.Z Release notes (YYYY-MM-DD)
1.1.0 Release notes (2024-03-26)
=============================================================

### Fixed
Expand All @@ -13,6 +13,7 @@ X.Y.Z Release notes (YYYY-MM-DD)
* Add `managed<std::vector<>>::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<uint8_t, 16>`.
* 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()`.

Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion dependencies.list
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=1.0.0
VERSION=1.1.0
4 changes: 2 additions & 2 deletions src/cpprealm/bson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace realm {
bsoncxx::bsoncxx(const bsoncxx& v) noexcept
{
#ifdef CPPREALM_HAVE_GENERATED_BRIDGE_TYPES
*reinterpret_cast<bson::Bson*>(&m_bson) = *reinterpret_cast<const bson::Bson*>(&v.m_bson);
new (&m_bson) bson::Bson(*reinterpret_cast<const bson::Bson*>(&v.m_bson));
#else
m_bson = v.m_bson;
#endif
Expand All @@ -38,7 +38,7 @@ namespace realm {
bsoncxx::bsoncxx(bsoncxx&& v) noexcept
{
#ifdef CPPREALM_HAVE_GENERATED_BRIDGE_TYPES
*reinterpret_cast<bson::Bson*>(&m_bson) = std::move(*reinterpret_cast<bson::Bson*>(&v.m_bson));
new (&m_bson) bson::Bson(std::move(*reinterpret_cast<bson::Bson*>(&v.m_bson)));
#else
m_bson = std::move(v.m_bson);
#endif
Expand Down
Loading