From d10ddd9895c0a89d79d4f8c5cba40943629a7ec1 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 19 Jul 2017 17:57:55 +0200 Subject: [PATCH] be more explicit --- include/xbt/Extendable.hpp | 2 +- include/xbt/exception.hpp | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/xbt/Extendable.hpp b/include/xbt/Extendable.hpp index f158d50d80..5cf36a9525 100644 --- a/include/xbt/Extendable.hpp +++ b/include/xbt/Extendable.hpp @@ -24,7 +24,7 @@ class Extension { friend class Extendable; constexpr Extension(std::size_t id) : id_(id) {} public: - constexpr Extension() : id_(INVALID_ID) {} + explicit constexpr Extension() : id_(INVALID_ID) {} std::size_t id() const { return id_; } bool valid() { return id_ != INVALID_ID; } }; diff --git a/include/xbt/exception.hpp b/include/xbt/exception.hpp index 6e801981d2..7c826cd697 100644 --- a/include/xbt/exception.hpp +++ b/include/xbt/exception.hpp @@ -72,16 +72,10 @@ public: procname_(xbt_procname()), pid_(xbt_getpid()) {} - WithContextException(Backtrace bt) : - backtrace_(std::move(bt)), - procname_(xbt_procname()), - pid_(xbt_getpid()) + explicit WithContextException(Backtrace bt) : backtrace_(std::move(bt)), procname_(xbt_procname()), pid_(xbt_getpid()) {} - WithContextException(ThrowPoint throwpoint, Backtrace bt) : - backtrace_(std::move(bt)), - procname_(xbt_procname()), - pid_(xbt_getpid()), - throwpoint_(throwpoint) + explicit WithContextException(ThrowPoint throwpoint, Backtrace bt) + : backtrace_(std::move(bt)), procname_(xbt_procname()), pid_(xbt_getpid()), throwpoint_(throwpoint) {} virtual ~WithContextException(); Backtrace const& backtrace() const @@ -116,7 +110,7 @@ public: WithContext(E exception, WithContextException context) : E(std::move(exception)), WithContextException(std::move(context)) {} - ~WithContext() override {} + ~WithContext() override = default; }; /** Throw a C++ exception with some context -- 2.20.1