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 branch 'al-android-aar' of https://github.com/realm/realm-js into al-android-aar

This commit is contained in:
Nabil Hachicha 2016-01-12 19:41:24 +00:00
parent 8c80b42748 ced472b47e
commit 27bae32361
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js_init.h
View File

@ -5,7 +5,6 @@
#pragma once #pragma once
#include <JavaScriptCore/JSBase.h> #include <JavaScriptCore/JSBase.h>
#include <string>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
src/js_realm.cpp
View File

@ -108,7 +108,9 @@ std::map<std::string, JSValueRef> &RJSPrototypes(Realm *realm) {
// static std::string s_defaultPath = realm::default_realm_file_directory() + "/default.realm"; // static std::string s_defaultPath = realm::default_realm_file_directory() + "/default.realm";
static std::string s_defaultPath = ""; static std::string s_defaultPath = "";
std::string RJSDefaultPath() { std::string RJSDefaultPath() {
if (s_defaultPath.size() == 0) {
s_defaultPath = realm::default_realm_file_directory() + "/default.realm"; s_defaultPath = realm::default_realm_file_directory() + "/default.realm";
}
return s_defaultPath; return s_defaultPath;
} }
void RJSSetDefaultPath(std::string path) { void RJSSetDefaultPath(std::string path) {