Fix some issues found by cppcheck

This commit is contained in:
Jason Turner 2016-02-14 20:01:49 -07:00
parent e0827634bb
commit bc0eaa5d15
5 changed files with 14 additions and 12 deletions

View File

@ -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}) 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") 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() else()
add_definitions(-Wnoexcept) add_definitions(-Wnoexcept)
endif() endif()

View File

@ -45,14 +45,14 @@ namespace chaiscript
class unique_lock : public std::unique_lock<T> class unique_lock : public std::unique_lock<T>
{ {
public: public:
unique_lock(T &t) : std::unique_lock<T>(t) {} explicit unique_lock(T &t) : std::unique_lock<T>(t) {}
}; };
template<typename T> template<typename T>
class shared_lock : public std::unique_lock<T> class shared_lock : public std::unique_lock<T>
{ {
public: public:
shared_lock(T &t) : std::unique_lock<T>(t) {} explicit shared_lock(T &t) : std::unique_lock<T>(t) {}
void unlock() {} void unlock() {}
}; };
@ -60,7 +60,7 @@ namespace chaiscript
class lock_guard : public std::lock_guard<T> class lock_guard : public std::lock_guard<T>
{ {
public: public:
lock_guard(T &t) : std::lock_guard<T>(t) {} explicit lock_guard(T &t) : std::lock_guard<T>(t) {}
}; };
class shared_mutex : public std::mutex { }; class shared_mutex : public std::mutex { };
@ -77,7 +77,7 @@ namespace chaiscript
{ {
public: public:
Thread_Storage(void *t_key) explicit Thread_Storage(void *t_key)
: m_key(t_key) : m_key(t_key)
{ {
} }
@ -129,7 +129,7 @@ namespace chaiscript
{ {
public: public:
Thread_Storage(void *) explicit Thread_Storage(void *)
{ {
} }
@ -183,7 +183,7 @@ namespace chaiscript
class unique_lock class unique_lock
{ {
public: public:
unique_lock(T &) {} explicit unique_lock(T &) {}
void lock() {} void lock() {}
void unlock() {} void unlock() {}
}; };
@ -192,7 +192,7 @@ namespace chaiscript
class shared_lock class shared_lock
{ {
public: public:
shared_lock(T &) {} explicit shared_lock(T &) {}
void lock() {} void lock() {}
void unlock() {} void unlock() {}
}; };
@ -201,7 +201,7 @@ namespace chaiscript
class lock_guard class lock_guard
{ {
public: public:
lock_guard(T &) {} explicit lock_guard(T &) {}
}; };
class shared_mutex { }; class shared_mutex { };
@ -213,7 +213,7 @@ namespace chaiscript
class Thread_Storage class Thread_Storage
{ {
public: public:
Thread_Storage(void *) explicit Thread_Storage(void *)
{ {
} }

View File

@ -46,7 +46,7 @@ namespace chaiscript {
private: private:
struct Data struct Data
{ {
Data(const std::type_info &t_type) explicit Data(const std::type_info &t_type)
: m_type(t_type) : m_type(t_type)
{ {
} }

View File

@ -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)) : to(nullptr), m_what(std::move(t_what))
{ {
} }

View File

@ -172,8 +172,10 @@ namespace chaiscript
virtual Boxed_Value eval_internal(const chaiscript::detail::Dispatch_State &t_ss) const CHAISCRIPT_OVERRIDE { virtual Boxed_Value eval_internal(const chaiscript::detail::Dispatch_State &t_ss) const CHAISCRIPT_OVERRIDE {
if (!m_value.is_undef()) if (!m_value.is_undef())
{ {
std::cout << "1\n";
return m_value; return m_value;
} else { } else {
std::cout << "0\n";
try { try {
return t_ss->get_object(this->text, m_loc); return t_ss->get_object(this->text, m_loc);
} }