From c14d9dfb6e862e98f4e722790fb6e399aaa7f7f2 Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Tue, 8 May 2018 10:05:10 -0600
Subject: [PATCH] Fix some new clang related warnings

---
 include/chaiscript/dispatchkit/bootstrap.hpp | 8 ++++----
 src/test_module.cpp                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp
index bcaebfca..1cddf81e 100644
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -23,10 +23,10 @@ namespace chaiscript
       void array(const std::string &type, Module& m)
       {
         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(fun(
-              [extent](T& t, size_t index)->ReturnType &{
+              [](T& t, size_t index)->ReturnType &{
                 if (extent > 0 && index >= extent) {
                   throw std::range_error("Array index out of range. Received: " + std::to_string(index)  + " expected < " + std::to_string(extent));
                 } else {
@@ -37,7 +37,7 @@ namespace chaiscript
             );
 
         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) {
                   throw std::range_error("Array index out of range. Received: " + std::to_string(index)  + " expected < " + std::to_string(extent));
                 } else {
@@ -48,7 +48,7 @@ namespace chaiscript
             );
 
         m.add(fun(
-              [extent](const T &) {
+              [](const T &) {
                 return extent;
               }), "size");
       }
diff --git a/src/test_module.cpp b/src/test_module.cpp
index fcb255e5..90a1154a 100644
--- a/src/test_module.cpp
+++ b/src/test_module.cpp
@@ -78,7 +78,7 @@ int to_int(TestEnum t)
 class TestDerivedType : public TestBaseType
 {
   public:
-    virtual ~TestDerivedType() {}
+    ~TestDerivedType() override {}
     TestDerivedType(const TestDerivedType &) = default;
     TestDerivedType() = default;
     virtual int func() override { return 1; }