From 9f8cdec065147604e60ea03805456f604884d983 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 14 Jun 2017 09:33:18 +0200 Subject: [PATCH] MC doesn'y like some of the explicit --- include/xbt/string.hpp | 6 +++--- src/mc/LocationList.hpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp index f37e189074..cafddcb5b8 100644 --- a/include/xbt/string.hpp +++ b/include/xbt/string.hpp @@ -89,7 +89,7 @@ public: } } string() : string (const_cast(&NUL), 0) {} - explicit string(const char* s) : string(s, strlen(s)) {} + string(const char* s) : string(s, strlen(s)) {} string(string const& s) : string(s.c_str(), s.size()) {} string(string&& s) { @@ -98,7 +98,7 @@ public: s.string_data::len = 0; s.string_data::data = const_cast(&NUL); } - explicit string(std::string const& s) : string(s.c_str(), s.size()) {} + string(std::string const& s) : string(s.c_str(), s.size()) {} // Assign void assign(const char* s, size_t size) @@ -165,7 +165,7 @@ public: return data()[i]; } // Conversion - explicit operator std::string() const { return std::string(this->c_str(), this->size()); } + operator std::string() const { return std::string(this->c_str(), this->size()); } // Iterators iterator begin() { return data(); } diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp index 01b695d21c..58b9fe24b8 100644 --- a/src/mc/LocationList.hpp +++ b/src/mc/LocationList.hpp @@ -38,8 +38,7 @@ public: LocationListEntry(DwarfExpression expression, range_type range) : expression_(std::move(expression)), range_(range) {} - explicit LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}) - {} + LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}) {} DwarfExpression& expression() { -- 2.20.1