From e48e0b19f75855bc57e122a558c4a317254144e1 Mon Sep 17 00:00:00 2001
From: Ari Lazier <alazier@gmail.com>
Date: Mon, 28 Nov 2016 07:42:41 -0800
Subject: [PATCH] fixes for latest object store update

---
 src/js_realm.hpp | 4 +++-
 src/js_sync.hpp  | 2 +-
 src/object-store | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/js_realm.hpp b/src/js_realm.hpp
index 013c4e6c..86ed3e04 100644
--- a/src/js_realm.hpp
+++ b/src/js_realm.hpp
@@ -62,7 +62,9 @@ class RealmDelegate : public BindingContext {
     using ObjectDefaultsMap = typename Schema<T>::ObjectDefaultsMap;
     using ConstructorMap = typename Schema<T>::ConstructorMap;
 
-    virtual void did_change(std::vector<ObserverState> const& observers, std::vector<void*> const& invalidated) {
+    virtual void did_change(std::vector<ObserverState> const& observers,
+                            std::vector<void*> const& invalidated,
+                            bool version_changed=true) {
         notify("change");
     }
     virtual std::vector<ObserverState> get_observed_rows() {
diff --git a/src/js_sync.hpp b/src/js_sync.hpp
index 253ef85c..6fd0ac28 100644
--- a/src/js_sync.hpp
+++ b/src/js_sync.hpp
@@ -303,7 +303,7 @@ void SyncClass<T>::populate_sync_config(ContextType ctx, ObjectType realm_constr
 
         // FIXME - use make_shared
         config.sync_config = std::shared_ptr<SyncConfig>(
-            new SyncConfig(shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler)
+                                                         new SyncConfig({shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler, [=](int error_code, std::string message, SyncSessionError) {}})
         );
         config.schema_mode = SchemaMode::Additive;
         config.path = realm::SyncManager::shared().path_for_realm(shared_user->identity(), raw_realm_url);
diff --git a/src/object-store b/src/object-store
index aa6b8ee6..a61a0de0 160000
--- a/src/object-store
+++ b/src/object-store
@@ -1 +1 @@
-Subproject commit aa6b8ee613e79c664bc59717ac84de8b33619594
+Subproject commit a61a0de00ffb15d9437629368dbaaef4ac40403a