From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 24 Oct 2012 17:16:42 +0000 (-0700)
Subject: [master] use terminate() instead of assert(false) for forceful termination
X-Git-Tag: trac2406_base
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296e119946e9fb8d6eebdabf6eb166f47c47fbd0;p=thirdparty%2Fkea.git

[master] use terminate() instead of assert(false) for forceful termination
---

diff --git a/src/bin/auth/datasrc_clients_mgr.h b/src/bin/auth/datasrc_clients_mgr.h
index d42d26cd01..48bae81569 100644
--- a/src/bin/auth/datasrc_clients_mgr.h
+++ b/src/bin/auth/datasrc_clients_mgr.h
@@ -36,6 +36,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
+#include <exception>
 #include <list>
 #include <utility>
 
@@ -406,10 +407,10 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::run() {
         // We explicitly catch exceptions so we can log it as soon as possible.
         LOG_FATAL(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_FAILED).
             arg(ex.what());
-        assert(false);
+        std::terminate();
     } catch (...) {
         LOG_FATAL(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_FAILED_UNEXPECTED);
-        assert(false);
+        std::terminate();
     }
 }