status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-01-11 14:54:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75 from realm/sk/android-fixes

Browse Source 
Fix for object store build issues on Android
This commit is contained in:
Scott Kyle 2016-06-01 09:43:25 -07:00
commit 30f1c83197
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/impl/android/external_commit_helper.cpp
View File

@ -19,8 +19,8 @@
#include "impl/external_commit_helper.hpp" #include "impl/external_commit_helper.hpp"
#include "impl/realm_coordinator.hpp" #include "impl/realm_coordinator.hpp"
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sstream> #include <sstream>
#include <sys/epoll.h> #include <sys/epoll.h>
@ -36,9 +36,6 @@
#define ANDROID_LOG(...) #define ANDROID_LOG(...)
#endif #endif
#include <errno.h>
#include <sstream>
using namespace realm; using namespace realm;
using namespace realm::_impl; using namespace realm::_impl;

1
src/impl/android/weak_realm_notifier.cpp
View File

@ -19,6 +19,7 @@
#include "impl/weak_realm_notifier.hpp" #include "impl/weak_realm_notifier.hpp"
#include "shared_realm.hpp" #include "shared_realm.hpp"
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <android/log.h> #include <android/log.h>

2
src/shared_realm.hpp
View File

@ -132,6 +132,8 @@ namespace realm {
// Realm after closing it will produce undefined behavior. // Realm after closing it will produce undefined behavior.
void close(); void close();
bool is_closed() { return !m_read_only_group && !m_shared_group; }
~Realm(); ~Realm();
void init(std::shared_ptr<_impl::RealmCoordinator> coordinator); void init(std::shared_ptr<_impl::RealmCoordinator> coordinator);