aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/include/syncobj.h
diff options
context:
space:
mode:
authorwoodser <woodser@protonmail.com>2020-04-15 13:22:46 -0400
committerwoodser <woodser@protonmail.com>2020-04-15 13:22:46 -0400
commit87d75584e8df95ff53a354438760088e061a6de5 (patch)
tree42051b14bad7561239af4a26e5b29f45debdd8bb /contrib/epee/include/syncobj.h
parentMerge pull request #6405 (diff)
downloadmonero-87d75584e8df95ff53a354438760088e061a6de5.tar.xz
Allow wallet2.h to run in WebAssembly
- Add abstract_http_client.h which http_client.h extends. - Replace simple_http_client with abstract_http_client in wallet2, message_store, message_transporter, and node_rpc_proxy. - Import and export wallet data in wallet2. - Use #if defined __EMSCRIPTEN__ directives to skip incompatible code.
Diffstat (limited to '')
-rw-r--r--contrib/epee/include/syncobj.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/epee/include/syncobj.h b/contrib/epee/include/syncobj.h
index dba02f270..804bafda7 100644
--- a/contrib/epee/include/syncobj.h
+++ b/contrib/epee/include/syncobj.h
@@ -150,7 +150,7 @@ namespace epee
};
-#define CRITICAL_REGION_LOCAL(x) {boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep()));} epee::critical_region_t<decltype(x)> critical_region_var(x)
+#define CRITICAL_REGION_LOCAL(x) {} epee::critical_region_t<decltype(x)> critical_region_var(x)
#define CRITICAL_REGION_BEGIN(x) { boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep())); epee::critical_region_t<decltype(x)> critical_region_var(x)
#define CRITICAL_REGION_LOCAL1(x) {boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep()));} epee::critical_region_t<decltype(x)> critical_region_var1(x)
#define CRITICAL_REGION_BEGIN1(x) { boost::this_thread::sleep_for(boost::chrono::milliseconds(epee::debug::g_test_dbg_lock_sleep())); epee::critical_region_t<decltype(x)> critical_region_var1(x)