diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp index e8871192..0b1a1b11 100644 --- a/single/sol/sol.hpp +++ b/single/sol/sol.hpp @@ -20,8 +20,8 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // This file was generated with a script. -// Generated 2016-09-18 02:22:48.336425 UTC -// This header was generated with sol v2.14.0 (revision 132ff87) +// Generated 2016-09-18 02:39:04.820718 UTC +// This header was generated with sol v2.14.0 (revision 1dfeb1d) // https://github.com/ThePhD/sol2 #ifndef SOL_SINGLE_INCLUDE_HPP @@ -9625,8 +9625,9 @@ namespace sol { typedef std::tuple ...> Tuple; template struct check_binding : is_variable_binding> {}; + typedef std::unordered_map mapping_t; Tuple functions; - std::unordered_map mapping; + mapping_t mapping; lua_CFunction indexfunc; lua_CFunction newindexfunc; lua_CFunction destructfunc; @@ -9752,15 +9753,14 @@ namespace sol { baseclasscheck(nullptr), baseclasscast(nullptr), mustindex(contains_variable() || contains_index()), secondarymeta(contains_variable()), hasequals(false), hasless(false), haslessequals(false) { - mapping.insert( - { { + std::initializer_list ilist{ { std::pair( usertype_detail::make_string(std::get(functions)), - usertype_detail::find_call_pair( &usertype_metatable::real_find_call, - &usertype_metatable::real_find_call ) + usertype_detail::find_call_pair(&usertype_metatable::real_find_call, + &usertype_metatable::real_find_call) ) - }... } - ); + }... }; + mapping.insert(ilist); } template diff --git a/sol/usertype_metatable.hpp b/sol/usertype_metatable.hpp index e14a937f..cd57f267 100644 --- a/sol/usertype_metatable.hpp +++ b/sol/usertype_metatable.hpp @@ -235,8 +235,9 @@ namespace sol { typedef std::tuple ...> Tuple; template struct check_binding : is_variable_binding> {}; + typedef std::unordered_map mapping_t; Tuple functions; - std::unordered_map mapping; + mapping_t mapping; lua_CFunction indexfunc; lua_CFunction newindexfunc; lua_CFunction destructfunc; @@ -362,15 +363,14 @@ namespace sol { baseclasscheck(nullptr), baseclasscast(nullptr), mustindex(contains_variable() || contains_index()), secondarymeta(contains_variable()), hasequals(false), hasless(false), haslessequals(false) { - mapping.insert( - { { + std::initializer_list ilist{ { std::pair( usertype_detail::make_string(std::get(functions)), - usertype_detail::find_call_pair( &usertype_metatable::real_find_call, - &usertype_metatable::real_find_call ) + usertype_detail::find_call_pair(&usertype_metatable::real_find_call, + &usertype_metatable::real_find_call) ) - }... } - ); + }... }; + mapping.insert(ilist); } template