diff --git a/include/sol/stack_field.hpp b/include/sol/stack_field.hpp index 70b0903a..a0ef28f8 100644 --- a/include/sol/stack_field.hpp +++ b/include/sol/stack_field.hpp @@ -212,7 +212,7 @@ namespace sol { namespace stack { } } else { - if constexpr (meta::is_c_str_v) { + if constexpr (meta::is_c_str_or_string_v) { if constexpr (global) { push(L, std::forward(value)); lua_setglobal(L, &key[0]); diff --git a/include/sol/traits.hpp b/include/sol/traits.hpp index 3e7ff4ce..5af4cb37 100644 --- a/include/sol/traits.hpp +++ b/include/sol/traits.hpp @@ -699,7 +699,7 @@ namespace sol { namespace meta { using is_c_str_or_string = is_c_str_or_string_of; template - constexpr inline bool is_c_str_or_string_v = is_c_str::value; + constexpr inline bool is_c_str_or_string_v = is_c_str_or_string::value; template struct is_move_only : all>, neg>>, std::is_move_constructible>> { }; diff --git a/include/sol/usertype_storage.hpp b/include/sol/usertype_storage.hpp index b8475134..fdfac5ff 100644 --- a/include/sol/usertype_storage.hpp +++ b/include/sol/usertype_storage.hpp @@ -66,11 +66,11 @@ namespace sol { namespace u_detail { template struct binding : binding_base { using uF = meta::unqualified_t; - using F = meta::conditional_t + using F = meta::conditional_t #if SOL_IS_ON(SOL_CHAR8_T_I_) - || meta::is_c_str_or_string_of_v + || meta::is_c_str_of_v #endif - || meta::is_c_str_or_string_of_v || meta::is_c_str_or_string_of_v || meta::is_c_str_or_string_of_v, + || meta::is_c_str_of_v || meta::is_c_str_of_v || meta::is_c_str_of_v, std::add_pointer_t>>, std::decay_t>; F data_;