From ef333e491ad5f74b4a10e0208793d1bf9c7c5f35 Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Thu, 20 Jul 2017 21:16:54 -0600
Subject: [PATCH] remove existing `constexpr`

---
 .../chaiscript/dispatchkit/boxed_number.hpp   |  2 +-
 include/chaiscript/dispatchkit/type_info.hpp  | 46 +++++++++----------
 .../chaiscript/language/chaiscript_parser.hpp |  2 +-
 include/chaiscript/utility/static_string.hpp  |  6 +--
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index 8f1e871f..8b46f43c 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -94,7 +94,7 @@ namespace chaiscript
       {
       }
 
-      static constexpr Common_Types get_common_type(size_t t_size, bool t_signed)
+      static Common_Types get_common_type(size_t t_size, bool t_signed)
       {
         return   (t_size == 1 && t_signed)?(Common_Types::t_int8)
                 :(t_size == 1)?(Common_Types::t_uint8)
diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp
index 4e508474..4480f3c7 100644
--- a/include/chaiscript/dispatchkit/type_info.hpp
+++ b/include/chaiscript/dispatchkit/type_info.hpp
@@ -33,7 +33,7 @@ namespace chaiscript
   class Type_Info
   {
     public:
-      constexpr Type_Info(const bool t_is_const, const bool t_is_reference, const bool t_is_pointer, const bool t_is_void, 
+      Type_Info(const bool t_is_const, const bool t_is_reference, const bool t_is_pointer, const bool t_is_void, 
           const bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bare_ti)
         : m_type_info(t_ti), m_bare_type_info(t_bare_ti),
           m_flags((static_cast<unsigned int>(t_is_const) << is_const_flag)
@@ -44,51 +44,51 @@ namespace chaiscript
       {
       }
 
-      constexpr Type_Info() = default;
+      Type_Info() = default;
 
-      constexpr bool operator<(const Type_Info &ti) const noexcept
+      bool operator<(const Type_Info &ti) const noexcept
       {
         return m_type_info < ti.m_type_info;
       }
 
-      constexpr bool operator!=(const Type_Info &ti) const noexcept
+      bool operator!=(const Type_Info &ti) const noexcept
       {
         return !(operator==(ti));
       }
 
-      constexpr bool operator!=(const std::type_info &ti) const noexcept
+      bool operator!=(const std::type_info &ti) const noexcept
       {
         return !(operator==(ti));
       }
 
-      constexpr bool operator==(const Type_Info &ti) const noexcept
+      bool operator==(const Type_Info &ti) const noexcept
       {
         return ti.m_type_info == m_type_info
            || *ti.m_type_info == *m_type_info;
       }
 
-      constexpr bool operator==(const std::type_info &ti) const noexcept
+      bool operator==(const std::type_info &ti) const noexcept
       {
         return !is_undef() && (*m_type_info) == ti;
       }
 
-      constexpr bool bare_equal(const Type_Info &ti) const noexcept
+      bool bare_equal(const Type_Info &ti) const noexcept
       {
         return ti.m_bare_type_info == m_bare_type_info
            || *ti.m_bare_type_info == *m_bare_type_info;
       }
 
-      constexpr bool bare_equal_type_info(const std::type_info &ti) const noexcept
+      bool bare_equal_type_info(const std::type_info &ti) const noexcept
       {
         return !is_undef() && (*m_bare_type_info) == ti;
       }
 
-      constexpr bool is_const() const noexcept { return (m_flags & (1 << is_const_flag)) != 0; }
-      constexpr bool is_reference() const noexcept { return (m_flags & (1 << is_reference_flag)) != 0; }
-      constexpr bool is_void() const noexcept { return (m_flags & (1 << is_void_flag)) != 0; }
-      constexpr bool is_arithmetic() const noexcept { return (m_flags & (1 << is_arithmetic_flag)) != 0; }
-      constexpr bool is_undef() const noexcept { return (m_flags & (1 << is_undef_flag)) != 0; }
-      constexpr bool is_pointer() const noexcept { return (m_flags & (1 << is_pointer_flag)) != 0; }
+      bool is_const() const noexcept { return (m_flags & (1 << is_const_flag)) != 0; }
+      bool is_reference() const noexcept { return (m_flags & (1 << is_reference_flag)) != 0; }
+      bool is_void() const noexcept { return (m_flags & (1 << is_void_flag)) != 0; }
+      bool is_arithmetic() const noexcept { return (m_flags & (1 << is_arithmetic_flag)) != 0; }
+      bool is_undef() const noexcept { return (m_flags & (1 << is_undef_flag)) != 0; }
+      bool is_pointer() const noexcept { return (m_flags & (1 << is_pointer_flag)) != 0; }
 
       std::string name() const
       {
@@ -110,7 +110,7 @@ namespace chaiscript
         }
       }
 
-      constexpr const std::type_info *bare_type_info() const
+      const std::type_info *bare_type_info() const
       {
         return m_bare_type_info;
       }
@@ -135,7 +135,7 @@ namespace chaiscript
     template<typename T>
       struct Get_Type_Info
       {
-        static constexpr Type_Info get()
+        static Type_Info get()
         {
           return Type_Info(std::is_const<typename std::remove_pointer<typename std::remove_reference<T>::type>::type>::value, 
               std::is_reference<T>::value, std::is_pointer<T>::value, 
@@ -152,7 +152,7 @@ namespace chaiscript
       {
 //        typedef T type;
 
-        static constexpr Type_Info get()
+        static Type_Info get()
         {
           return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
@@ -170,7 +170,7 @@ namespace chaiscript
     template<typename T>
       struct Get_Type_Info<const std::shared_ptr<T> &>
       {
-        static constexpr Type_Info get()
+        static Type_Info get()
         {
           return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
@@ -183,7 +183,7 @@ namespace chaiscript
     template<typename T>
       struct Get_Type_Info<std::reference_wrapper<T> >
       {
-        static constexpr Type_Info get()
+        static Type_Info get()
         {
           return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
@@ -196,7 +196,7 @@ namespace chaiscript
     template<typename T>
       struct Get_Type_Info<const std::reference_wrapper<T> &>
       {
-        static constexpr Type_Info get()
+        static Type_Info get()
         {
           return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
@@ -218,7 +218,7 @@ namespace chaiscript
   /// chaiscript::Type_Info ti = chaiscript::user_type(i);
   /// \endcode
   template<typename T>
-  constexpr Type_Info user_type(const T &/*t*/)
+  Type_Info user_type(const T &/*t*/)
   {
     return detail::Get_Type_Info<T>::get();
   }
@@ -233,7 +233,7 @@ namespace chaiscript
   /// chaiscript::Type_Info ti = chaiscript::user_type<int>();
   /// \endcode
   template<typename T>
-  constexpr Type_Info user_type()
+  Type_Info user_type()
   {
     return detail::Get_Type_Info<T>::get();
   }
diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp
index 06a51dfa..8db33d02 100644
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -2286,7 +2286,7 @@ namespace chaiscript
       bool Prefix() {
         const auto prev_stack_top = m_match_stack.size();
         using SS = utility::Static_String;
-        constexpr const std::array<utility::Static_String, 6> prefix_opers{{
+        const std::array<utility::Static_String, 6> prefix_opers{{
             SS{"++"}, 
             SS{"--"}, 
             SS{"-"}, 
diff --git a/include/chaiscript/utility/static_string.hpp b/include/chaiscript/utility/static_string.hpp
index 49edfbd8..b1be2211 100644
--- a/include/chaiscript/utility/static_string.hpp
+++ b/include/chaiscript/utility/static_string.hpp
@@ -15,16 +15,16 @@ namespace chaiscript
     struct Static_String
     {
       template<size_t N>
-        constexpr Static_String(const char (&str)[N])
+        Static_String(const char (&str)[N])
         : m_size(N-1), data(&str[0])
         {
         }
 
-      constexpr size_t size() const {
+      size_t size() const {
         return m_size;
       }
 
-      constexpr const char *c_str() const {
+      const char *c_str() const {
         return data;
       }