status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-02-20 02:18:26 +00:00
Code Issues Projects Releases Wiki Activity

fix for android compilation

Browse Source
This commit is contained in:
Ari Lazier 2016-05-13 18:45:42 -07:00
parent 0c1fdaadda
commit 3d0af084bb
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
react-native/android/src/main/jni/Android.mk
View File

@ -22,21 +22,21 @@ LOCAL_SRC_FILES := \
src/android/io_realm_react_RealmReactModule.cpp \ src/android/io_realm_react_RealmReactModule.cpp \
src/android/jsc_override.cpp \ src/android/jsc_override.cpp \
src/object-store/src/collection_notifications.cpp \ src/object-store/src/collection_notifications.cpp \
src/object-store/src/collection_change_builder.cpp \
src/object-store/src/collection_notifier.cpp \
src/object-store/src/index_set.cpp \ src/object-store/src/index_set.cpp \
src/object-store/src/list.cpp \ src/object-store/src/list.cpp \
src/object-store/src/list_notifier.cpp \
src/object-store/src/object_schema.cpp \ src/object-store/src/object_schema.cpp \
src/object-store/src/object_store.cpp \ src/object-store/src/object_store.cpp \
src/object-store/src/results.cpp \ src/object-store/src/results.cpp \
src/object-store/src/results_notifier.cpp \
src/object-store/src/schema.cpp \ src/object-store/src/schema.cpp \
src/object-store/src/shared_realm.cpp \ src/object-store/src/shared_realm.cpp \
src/object-store/src/parser/parser.cpp \ src/object-store/src/parser/parser.cpp \
src/object-store/src/parser/query_builder.cpp \ src/object-store/src/parser/query_builder.cpp \
src/object-store/src/impl/transact_log_handler.cpp \ src/object-store/src/impl/collection_change_builder.cpp \
src/object-store/src/impl/collection_notifier.cpp \
src/object-store/src/impl/list_notifier.cpp \
src/object-store/src/impl/realm_coordinator.cpp \ src/object-store/src/impl/realm_coordinator.cpp \
src/object-store/src/impl/results_notifier.cpp \
src/object-store/src/impl/transact_log_handler.cpp \
src/object-store/src/impl/generic/external_commit_helper.cpp \ src/object-store/src/impl/generic/external_commit_helper.cpp \
vendor/base64.cpp vendor/base64.cpp

1
src/object-store/src/impl/collection_change_builder.cpp
View File

@ -19,6 +19,7 @@
#include "impl/collection_change_builder.hpp" #include "impl/collection_change_builder.hpp"
#include <realm/util/assert.hpp> #include <realm/util/assert.hpp>
#include <algorithm>
using namespace realm; using namespace realm;
using namespace realm::_impl; using namespace realm::_impl;

1
src/object-store/src/impl/realm_coordinator.cpp
View File

@ -31,6 +31,7 @@
#include <realm/string_data.hpp> #include <realm/string_data.hpp>
#include <unordered_map> #include <unordered_map>
#include <algorithm>
using namespace realm; using namespace realm;
using namespace realm::_impl; using namespace realm::_impl;

1
src/object-store/src/impl/transact_log_handler.cpp
View File

@ -24,6 +24,7 @@
#include <realm/group_shared.hpp> #include <realm/group_shared.hpp>
#include <realm/lang_bind_helper.hpp> #include <realm/lang_bind_helper.hpp>
#include <algorithm>
using namespace realm; using namespace realm;

2
src/object-store/src/results.cpp
View File

@ -411,7 +411,7 @@ Query Results::get_query() const
// The TableView has no associated query so create one with no conditions that is restricted // The TableView has no associated query so create one with no conditions that is restricted
// to the rows in the TableView. // to the rows in the TableView.
m_table_view.sync_if_needed(); m_table_view.sync_if_needed();
return Query(*m_table, std::make_unique<TableView>(m_table_view)); return Query(*m_table, (std::unique_ptr<TableViewBase>)std::make_unique<TableView>(m_table_view));
} }
case Mode::LinkView: case Mode::LinkView:
return m_table->where(m_link_view); return m_table->where(m_link_view);