coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-06 16:57:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some new clang related warnings

Browse Source
This commit is contained in:
Jason Turner 2018-05-08 10:05:10 -06:00
parent f695a24e1b
commit c14d9dfb6e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@ -23,10 +23,10 @@ namespace chaiscript
void array(const std::string &type, Module& m) void array(const std::string &type, Module& m)
{ {
typedef typename std::remove_extent<T>::type ReturnType; typedef typename std::remove_extent<T>::type ReturnType;
const auto extent = std::extent<T>::value; constexpr auto extent = std::extent<T>::value;
m.add(user_type<T>(), type); m.add(user_type<T>(), type);
m.add(fun( m.add(fun(
[extent](T& t, size_t index)->ReturnType &{ [](T& t, size_t index)->ReturnType &{
if (extent > 0 && index >= extent) { if (extent > 0 && index >= extent) {
throw std::range_error("Array index out of range. Received: " + std::to_string(index) + " expected < " + std::to_string(extent)); throw std::range_error("Array index out of range. Received: " + std::to_string(index) + " expected < " + std::to_string(extent));
} else { } else {
@ -37,7 +37,7 @@ namespace chaiscript
); );
m.add(fun( m.add(fun(
[extent](const T &t, size_t index)->const ReturnType &{ [](const T &t, size_t index)->const ReturnType &{
if (extent > 0 && index >= extent) { if (extent > 0 && index >= extent) {
throw std::range_error("Array index out of range. Received: " + std::to_string(index) + " expected < " + std::to_string(extent)); throw std::range_error("Array index out of range. Received: " + std::to_string(index) + " expected < " + std::to_string(extent));
} else { } else {
@ -48,7 +48,7 @@ namespace chaiscript
); );
m.add(fun( m.add(fun(
[extent](const T &) { [](const T &) {
return extent; return extent;
}), "size"); }), "size");
} }

2
src/test_module.cpp
View File

@ -78,7 +78,7 @@ int to_int(TestEnum t)
class TestDerivedType : public TestBaseType class TestDerivedType : public TestBaseType
{ {
public: public:
virtual ~TestDerivedType() {} ~TestDerivedType() override {}
TestDerivedType(const TestDerivedType &) = default; TestDerivedType(const TestDerivedType &) = default;
TestDerivedType() = default; TestDerivedType() = default;
virtual int func() override { return 1; } virtual int func() override { return 1; }