diff --git a/CMakeLists.txt b/CMakeLists.txt index 07af575..e064455 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,7 +178,7 @@ else() add_definitions(-Wall -Wextra -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wcast-qual -Wunused -Woverloaded-virtual -pedantic ${CPP11_FLAG}) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - add_definitions(-Weverything -Wno-c++98-compat-pedantic -Wno-c++98-compat -Wno-documentation -Wno-switch-enum -Wno-weak-vtables -Wno-sign-conversion -Wno-missing-prototypes -Wno-padded -Wno-missing-noreturn -Wno-exit-time-destructors) + add_definitions(-Weverything -Wno-c++98-compat-pedantic -Wno-c++98-compat -Wno-documentation -Wno-switch-enum -Wno-weak-vtables -Wno-sign-conversion -Wno-missing-prototypes -Wno-padded -Wno-missing-noreturn -Wno-exit-time-destructors -Wno-documentation-unknown-command) else() add_definitions(-Wnoexcept) endif() diff --git a/include/chaiscript/chaiscript_threading.hpp b/include/chaiscript/chaiscript_threading.hpp index 0bb3cfd..f273be6 100644 --- a/include/chaiscript/chaiscript_threading.hpp +++ b/include/chaiscript/chaiscript_threading.hpp @@ -45,14 +45,14 @@ namespace chaiscript class unique_lock : public std::unique_lock { public: - unique_lock(T &t) : std::unique_lock(t) {} + explicit unique_lock(T &t) : std::unique_lock(t) {} }; template class shared_lock : public std::unique_lock { public: - shared_lock(T &t) : std::unique_lock(t) {} + explicit shared_lock(T &t) : std::unique_lock(t) {} void unlock() {} }; @@ -60,7 +60,7 @@ namespace chaiscript class lock_guard : public std::lock_guard { public: - lock_guard(T &t) : std::lock_guard(t) {} + explicit lock_guard(T &t) : std::lock_guard(t) {} }; class shared_mutex : public std::mutex { }; @@ -77,7 +77,7 @@ namespace chaiscript { public: - Thread_Storage(void *t_key) + explicit Thread_Storage(void *t_key) : m_key(t_key) { } @@ -129,7 +129,7 @@ namespace chaiscript { public: - Thread_Storage(void *) + explicit Thread_Storage(void *) { } @@ -183,7 +183,7 @@ namespace chaiscript class unique_lock { public: - unique_lock(T &) {} + explicit unique_lock(T &) {} void lock() {} void unlock() {} }; @@ -192,7 +192,7 @@ namespace chaiscript class shared_lock { public: - shared_lock(T &) {} + explicit shared_lock(T &) {} void lock() {} void unlock() {} }; @@ -201,7 +201,7 @@ namespace chaiscript class lock_guard { public: - lock_guard(T &) {} + explicit lock_guard(T &) {} }; class shared_mutex { }; @@ -213,7 +213,7 @@ namespace chaiscript class Thread_Storage { public: - Thread_Storage(void *) + explicit Thread_Storage(void *) { } diff --git a/include/chaiscript/dispatchkit/any.hpp b/include/chaiscript/dispatchkit/any.hpp index 8a624b1..e86ba0e 100644 --- a/include/chaiscript/dispatchkit/any.hpp +++ b/include/chaiscript/dispatchkit/any.hpp @@ -46,7 +46,7 @@ namespace chaiscript { private: struct Data { - Data(const std::type_info &t_type) + explicit Data(const std::type_info &t_type) : m_type(t_type) { } diff --git a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp index c2be40f..4a18e06 100644 --- a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp +++ b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp @@ -40,7 +40,7 @@ namespace chaiscript { } - bad_boxed_cast(std::string t_what) CHAISCRIPT_NOEXCEPT + explicit bad_boxed_cast(std::string t_what) CHAISCRIPT_NOEXCEPT : to(nullptr), m_what(std::move(t_what)) { } diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp index c3391b5..114d5e4 100644 --- a/include/chaiscript/language/chaiscript_eval.hpp +++ b/include/chaiscript/language/chaiscript_eval.hpp @@ -172,8 +172,10 @@ namespace chaiscript virtual Boxed_Value eval_internal(const chaiscript::detail::Dispatch_State &t_ss) const CHAISCRIPT_OVERRIDE { if (!m_value.is_undef()) { + std::cout << "1\n"; return m_value; } else { + std::cout << "0\n"; try { return t_ss->get_object(this->text, m_loc); }