diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-06-19 21:25:52 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-06-19 21:25:52 +0200 |
| commit | ba61f37f9cb04b456157d6eec502440500453dbc (patch) | |
| tree | 6e52463617bb82d2dcf702ad268f943ec1c40112 /src/p2p/data_logger.hpp | |
| parent | Merge pull request #775 (diff) | |
| parent | fix: error: -Werror=misleading-indentation (diff) | |
| download | monero-ba61f37f9cb04b456157d6eec502440500453dbc.tar.xz | |
Merge pull request #846
de030d9 fix: error: -Werror=misleading-indentation (moneroexample)
c2d7300 contrib: epee: add exception spec to throwing destructors (redfish)
6898741 src: p2p: add exception spec to throwing destructors (redfish)
21dbc95 crypto: slow-hash: fix misleading indent (redfish)
70f3634 crypto: slow-hash: remove unused hash list for ARM (redfish)
1a7772f crypto: oaes_lib: remove unused _NR array (redfish)
6462a3a crypto: fix compile error: use named type in sizeof (redfish)
Diffstat (limited to 'src/p2p/data_logger.hpp')
| -rw-r--r-- | src/p2p/data_logger.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/p2p/data_logger.hpp b/src/p2p/data_logger.hpp index 148afc0ab..278d08bfc 100644 --- a/src/p2p/data_logger.hpp +++ b/src/p2p/data_logger.hpp @@ -55,7 +55,7 @@ enum class data_logger_state { state_before_init, state_during_init, state_ready public: static data_logger &get_instance(); ///< singleton static void kill_instance(); ///< call this before ending main to allow more gracefull shutdown of the main singleton and it's background thread - ~data_logger(); ///< destr, will be called when singleton is killed when global m_obj dies. will kill theads etc + ~data_logger() noexcept(false); ///< destr, will be called when singleton is killed when global m_obj dies. will kill theads etc private: data_logger(); ///< constructor is private, use only via singleton get_instance |