diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-06 14:40:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-06 14:40:13 +0200 |
commit | 496b13cb2e8dae4f9402d4bf11bbe97b5caec8ee (patch) | |
tree | 9bfea138b053c4d264874068c26f1bf49522b5cc /vespalib | |
parent | 32c4af492ac205cd727a5901de1ecccf8c95ae02 (diff) | |
parent | abb934f91cc30700f3f38ea6dba2fe3bb75dd036 (diff) |
Merge pull request #10196 from vespa-engine/toregge/use-std-exit-instead-of-std-quick-exit
Use std::_Exit instead of std::quick_exit.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/net/crypto_engine.cpp | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/util/exceptions.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/net/crypto_engine.cpp b/vespalib/src/vespa/vespalib/net/crypto_engine.cpp index ddc2ff14498..a52d4eeb690 100644 --- a/vespalib/src/vespa/vespalib/net/crypto_engine.cpp +++ b/vespalib/src/vespa/vespalib/net/crypto_engine.cpp @@ -234,7 +234,7 @@ CryptoEngine::SP try_create_default_crypto_engine() { return create_default_crypto_engine(); } catch (net::tls::CryptoException &e) { LOG(error, "failed to create default crypto engine: %s", e.what()); - std::quick_exit(78); + std::_Exit(78); } } diff --git a/vespalib/src/vespa/vespalib/util/exceptions.cpp b/vespalib/src/vespa/vespalib/util/exceptions.cpp index cdfa91c25ac..64ce947b5c0 100644 --- a/vespalib/src/vespa/vespalib/util/exceptions.cpp +++ b/vespalib/src/vespa/vespalib/util/exceptions.cpp @@ -33,7 +33,7 @@ vespalib::string _G_what; void silent_terminate() { std::lock_guard<std::mutex> guard(_G_silence_mutex); LOG(fatal, "Will exit with code 66 due to: %s", _G_what.c_str()); - std::quick_exit(66); + std::_Exit(66); } } |