From 991c25865a5edf1ae1337af83482a8f3910fb90e Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Mon, 23 Nov 2015 19:00:31 -0800 Subject: [PATCH 1/4] fix for reload in example --- src/shared_realm.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/shared_realm.cpp b/src/shared_realm.cpp index a2c8a2a5..2624f764 100644 --- a/src/shared_realm.cpp +++ b/src/shared_realm.cpp @@ -440,8 +440,6 @@ uint64_t Realm::get_schema_version(const realm::Realm::Config &config) void Realm::close() { - invalidate(); - if (m_coordinator) { m_coordinator->unregister_realm(this); } From 48d8b6a2e71da16b974762c82d3e3769c64f4e1e Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Mon, 14 Mar 2016 16:09:22 -0700 Subject: [PATCH 2/4] fixes #329 --- src/shared_realm.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared_realm.cpp b/src/shared_realm.cpp index 2624f764..b02c954d 100644 --- a/src/shared_realm.cpp +++ b/src/shared_realm.cpp @@ -184,7 +184,8 @@ Group *Realm::read_group() SharedRealm Realm::get_shared_realm(Config config) { - return RealmCoordinator::get_coordinator(config.path)->get_realm(std::move(config)); + auto coordinator = RealmCoordinator::get_coordinator(config.path); + return coordinator->get_realm(std::move(config)); } void Realm::update_schema(std::unique_ptr schema, uint64_t version) From f186c3d1b774635075a294d6c15661c18934d03a Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Fri, 18 Mar 2016 19:58:45 -0700 Subject: [PATCH 3/4] android fixes for latests object store --- src/impl/generic/external_commit_helper.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/impl/generic/external_commit_helper.hpp b/src/impl/generic/external_commit_helper.hpp index cc7fe5eb..8bfe43f2 100644 --- a/src/impl/generic/external_commit_helper.hpp +++ b/src/impl/generic/external_commit_helper.hpp @@ -21,7 +21,7 @@ #include namespace realm { -class ClientHistory; +class Replication; namespace _impl { class RealmCoordinator; @@ -38,7 +38,7 @@ private: RealmCoordinator& m_parent; // A shared group used to listen for changes - std::unique_ptr m_history; + std::unique_ptr m_history; SharedGroup m_sg; // The listener thread From 7ef25e9e143f85fbbb1d896fdca06cd525afb200 Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Fri, 18 Mar 2016 20:04:30 -0700 Subject: [PATCH 4/4] its a struct --- src/object_schema.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object_schema.hpp b/src/object_schema.hpp index 4ab2abf1..10a2e555 100644 --- a/src/object_schema.hpp +++ b/src/object_schema.hpp @@ -26,7 +26,7 @@ namespace realm { class Group; - class Property; + struct Property; class ObjectSchema { public: