diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-29 17:30:10 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-29 17:30:10 -0500 |
| commit | c3c4e28061429bdb0e9102557c5c9a826620b4c5 (patch) | |
| tree | 34d93ce3018862ca5add44a3dbb5b97f2f40b664 /src/daemon | |
| parent | Merge pull request #686 (diff) | |
| parent | move g_test_dbg_lock_sleep from a global to a function level static (diff) | |
| download | monero-c3c4e28061429bdb0e9102557c5c9a826620b4c5.tar.xz | |
Merge pull request #687
5e3557d move g_test_dbg_lock_sleep from a global to a function level static (moneromooo-monero)
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon.cpp | 2 | ||||
| -rw-r--r-- | src/daemon/main.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index ed6a66722..e79823d08 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -46,8 +46,6 @@ using namespace epee; #include <functional> -unsigned int epee::g_test_dbg_lock_sleep = 0; - namespace daemonize { struct t_internals { diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index 089d8fb69..0717fd89b 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -132,7 +132,7 @@ int main(int argc, char const * argv[]) return 0; } - epee::g_test_dbg_lock_sleep = command_line::get_arg(vm, command_line::arg_test_dbg_lock_sleep); + epee::debug::g_test_dbg_lock_sleep() = command_line::get_arg(vm, command_line::arg_test_dbg_lock_sleep); std::string db_type = command_line::get_arg(vm, command_line::arg_db_type); |