status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #701 from realm/al/js-latest 

fixes for latest object store update
This commit is contained in:
Ari Lazier 2016-11-28 12:49:43 -08:00 committed by GitHub
parent 9900d24181 6ed6b77b52
commit dae2311f27
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding.gyp
View File

@ -68,7 +68,7 @@
"conditions": [ "conditions": [
["OS=='linux'", { ["OS=='linux'", {
"sources": [ "sources": [
"src/object-store/src/impl/android/external_commit_helper.cpp", "src/object-store/src/impl/epoll/external_commit_helper.cpp",
] ]
}], }],
["OS=='mac'", { ["OS=='mac'", {

4
src/js_realm.hpp
View File

@ -62,7 +62,9 @@ class RealmDelegate : public BindingContext {
using ObjectDefaultsMap = typename Schema<T>::ObjectDefaultsMap; using ObjectDefaultsMap = typename Schema<T>::ObjectDefaultsMap;
using ConstructorMap = typename Schema<T>::ConstructorMap; 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"); notify("change");
} }
virtual std::vector<ObserverState> get_observed_rows() { virtual std::vector<ObserverState> get_observed_rows() {

3
src/js_sync.hpp
View File

@ -302,8 +302,7 @@ void SyncClass<T>::populate_sync_config(ContextType ctx, ObjectType realm_constr
std::string raw_realm_url = Object::validated_get_string(ctx, sync_config_object, "url"); std::string raw_realm_url = Object::validated_get_string(ctx, sync_config_object, "url");
// FIXME - use make_shared // FIXME - use make_shared
config.sync_config = std::shared_ptr<SyncConfig>( config.sync_config = std::shared_ptr<SyncConfig>(new SyncConfig{shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler, [=](int error_code, std::string message, SyncSessionError) {}}
new SyncConfig(shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler)
); );
config.schema_mode = SchemaMode::Additive; config.schema_mode = SchemaMode::Additive;
config.path = realm::SyncManager::shared().path_for_realm(shared_user->identity(), raw_realm_url); config.path = realm::SyncManager::shared().path_for_realm(shared_user->identity(), raw_realm_url);

2
src/object-store

@ -1 +1 @@
Subproject commit aa6b8ee613e79c664bc59717ac84de8b33619594 Subproject commit ddf845eb23884f6644d15c896952ee0f5ea5ad57