detail::quickval<> => std::declval<>

Author: tedmiddleton

mainframe/detail/base.hpp

@@ -23,12 +23,6 @@ const char* get_emptyspace(size_t num);
 size_t get_max_string_length(const std::vector<std::string>&);
 std::vector<size_t> get_max_string_lengths(const std::vector<std::vector<std::string>>&);
 
-template<typename T>
-struct quickval
-{
-    static T value;
-};
-
 template<typename T>
 auto
 stringify(std::ostream& o, const T& t, bool) -> decltype(o << t, o)

mainframe/detail/expression.hpp

@@ -423,9 +423,9 @@ struct binary_expr
     operator()(const Iter<IsConst, IsReverse, Ts...>& begin,
         const Iter<IsConst, IsReverse, Ts...>& curr,
         const Iter<IsConst, IsReverse, Ts...>& end) const
-        -> decltype(Op::exec(detail::quickval<L>::value.
+        -> decltype(Op::exec(std::declval<L&>().
                              operator()(begin, curr, end),
-            detail::quickval<R>::value.
+            std::declval<R&>().
             operator()(begin, curr, end)))
     {
         return Op::exec(l.operator()(begin, curr, end), r.operator()(begin, curr, end));
@@ -454,7 +454,7 @@ struct unary_expr
     operator()(const Iter<IsConst, IsReverse, Ts...>& begin,
         const Iter<IsConst, IsReverse, Ts...>& curr,
         const Iter<IsConst, IsReverse, Ts...>& end) const
-        -> decltype(Op::exec(detail::quickval<T>::value.
+        -> decltype(Op::exec(std::declval<T&>().
                              operator()(curr)))
     {
         return Op::exec(t.operator()(begin, curr, end));