From 34b81bef6b2a0898a67be3e2f8d4e1846032e816 Mon Sep 17 00:00:00 2001 From: ThePhD Date: Mon, 15 May 2017 10:41:50 -0400 Subject: [PATCH] Handle qualified name failures of VC++, where `using` templates do not match the fully qualified names of what they alias to (Thanks, VC++) --- CONTRIBUTING.md | 2 +- LICENSE.txt | 2 +- single.py | 2 +- single/sol/sol.hpp | 54 +++++++++++++++------------- sol.hpp | 2 +- sol/as_args.hpp | 2 +- sol/call.hpp | 2 +- sol/compatibility.hpp | 2 +- sol/compatibility/5.0.0.h | 2 +- sol/compatibility/5.1.0.h | 2 +- sol/compatibility/5.2.0.h | 2 +- sol/compatibility/5.x.x.h | 2 +- sol/compatibility/5.x.x.inl | 2 +- sol/compatibility/version.hpp | 2 +- sol/container_usertype_metatable.hpp | 2 +- sol/coroutine.hpp | 2 +- sol/debug.hpp | 2 +- sol/demangle.hpp | 2 +- sol/deprecate.hpp | 2 +- sol/environment.hpp | 2 +- sol/error.hpp | 2 +- sol/function.hpp | 2 +- sol/function_result.hpp | 2 +- sol/function_types.hpp | 2 +- sol/function_types_core.hpp | 2 +- sol/function_types_overloaded.hpp | 2 +- sol/function_types_stateful.hpp | 2 +- sol/function_types_stateless.hpp | 2 +- sol/function_types_templated.hpp | 2 +- sol/in_place.hpp | 2 +- sol/inheritance.hpp | 2 +- sol/load_result.hpp | 16 ++++----- sol/object.hpp | 2 +- sol/object_base.hpp | 2 +- sol/optional.hpp | 8 ++++- sol/optional_implementation.hpp | 2 +- sol/overload.hpp | 2 +- sol/property.hpp | 2 +- sol/protect.hpp | 2 +- sol/protected_function.hpp | 2 +- sol/protected_function_result.hpp | 8 ++--- sol/proxy.hpp | 6 ++-- sol/proxy_base.hpp | 2 +- sol/raii.hpp | 2 +- sol/reference.hpp | 2 +- sol/resolve.hpp | 2 +- sol/simple_usertype_metatable.hpp | 2 +- sol/stack.hpp | 2 +- sol/stack_check.hpp | 2 +- sol/stack_check_get.hpp | 2 +- sol/stack_core.hpp | 2 +- sol/stack_field.hpp | 2 +- sol/stack_get.hpp | 2 +- sol/stack_guard.hpp | 2 +- sol/stack_pop.hpp | 2 +- sol/stack_probe.hpp | 2 +- sol/stack_proxy.hpp | 2 +- sol/stack_push.hpp | 2 +- sol/stack_reference.hpp | 2 +- sol/state.hpp | 2 +- sol/state_view.hpp | 2 +- sol/string_shim.hpp | 2 +- sol/table.hpp | 2 +- sol/table_core.hpp | 16 ++++----- sol/table_iterator.hpp | 2 +- sol/thread.hpp | 2 +- sol/tie.hpp | 2 +- sol/traits.hpp | 2 +- sol/tuple.hpp | 2 +- sol/types.hpp | 2 +- sol/userdata.hpp | 2 +- sol/usertype.hpp | 2 +- sol/usertype_metatable.hpp | 6 ++-- sol/usertype_traits.hpp | 2 +- sol/variadic_args.hpp | 2 +- sol/wrapper.hpp | 2 +- 76 files changed, 132 insertions(+), 120 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9f5c97a..e04d6a6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ The guidelines for reporting a bug are relatively simple and are as follows: 2. Make a descriptive title that summarises the bug as a whole. 3. Explain the bug in as much detail as you can in the body of the issue. -If you have all of those requirements set, then your issue reporting is golden. +If you have all of those requirements set, then your issue reporting is golden. ## Submitting a pull request diff --git a/LICENSE.txt b/LICENSE.txt index 573fa0b0..967af964 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013-2016 Rapptz, ThePhD, and contributors +Copyright (c) 2013-2017 Rapptz, ThePhD, and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/single.py b/single.py index 7607d51e..9f56359f 100644 --- a/single.py +++ b/single.py @@ -25,7 +25,7 @@ os.chdir(script_path) intro = """// The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp index cd85565f..4828c366 100644 --- a/single/sol/sol.hpp +++ b/single/sol/sol.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -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 2017-05-09 17:31:19.874339 UTC -// This header was generated with sol v2.17.2 (revision 8efafca) +// Generated 2017-05-15 14:41:13.667703 UTC +// This header was generated with sol v2.17.3 (revision 7eccb58) // https://github.com/ThePhD/sol2 #ifndef SOL_SINGLE_INCLUDE_HPP @@ -2945,6 +2945,12 @@ namespace sol { const nullopt_t nullopt = boost::none; #endif // Boost vs. Better optional + namespace meta { + template + struct is_optional : std::false_type {}; + template + struct is_optional> : std::true_type {}; + } // meta } // sol // end of sol/optional.hpp @@ -9712,11 +9718,11 @@ namespace sol { call_status err; template - decltype(auto) tagged_get(types>) const { + decltype(auto) tagged_get(types>) const { if (!valid()) { - return sol::optional(nullopt); + return optional(nullopt); } - return stack::get>(L, index); + return stack::get>(L, index); } template @@ -10421,7 +10427,7 @@ namespace sol { template decltype(auto) get_or(T&& otherwise) const { typedef decltype(get()) U; - sol::optional option = get>(); + optional option = get>(); if (option) { return static_cast(option.value()); } @@ -10430,7 +10436,7 @@ namespace sol { template decltype(auto) get_or(D&& otherwise) const { - sol::optional option = get>(); + optional option = get>(); if (option) { return static_cast(option.value()); } @@ -10765,7 +10771,7 @@ namespace sol { if (is_simple) { simple_map& sm = stack::get>(L, upvalue_index(1)); function_map& functions = sm.functions; - sol::optional maybeaccessor = stack::get>(L, 2); + optional maybeaccessor = stack::get>(L, 2); if (!maybeaccessor) { return; } @@ -10783,7 +10789,7 @@ namespace sol { bool mustindex = umc.mustindex; if (!mustindex) return; - sol::optional maybeaccessor = stack::get>(L, 2); + optional maybeaccessor = stack::get>(L, 2); if (!maybeaccessor) { return; } @@ -12562,15 +12568,15 @@ namespace sol { -> decltype(stack::pop>(nullptr)) { typedef decltype(stack::pop>(nullptr)) Tup; return Tup( - traverse_get_optional(meta::is_specialization_of>(), detail::forward_get<0>(keys)), - traverse_get_optional(meta::is_specialization_of>(), detail::forward_get<1>(keys)), - traverse_get_optional(meta::is_specialization_of>(), detail::forward_get(keys))... + traverse_get_optional(meta::is_optional>(), detail::forward_get<0>(keys)), + traverse_get_optional(meta::is_optional>(), detail::forward_get<1>(keys)), + traverse_get_optional(meta::is_optional>(), detail::forward_get(keys))... ); } template decltype(auto) tuple_get(types, std::index_sequence, Keys&& keys) const { - return traverse_get_optional(meta::is_specialization_of>(), detail::forward_get(keys)); + return traverse_get_optional(meta::is_optional>(), detail::forward_get(keys)); } template @@ -12711,7 +12717,7 @@ namespace sol { template decltype(auto) get_or(Key&& key, T&& otherwise) const { typedef decltype(get("")) U; - sol::optional option = get>(std::forward(key)); + optional option = get>(std::forward(key)); if (option) { return static_cast(option.value()); } @@ -12720,7 +12726,7 @@ namespace sol { template decltype(auto) get_or(Key&& key, D&& otherwise) const { - sol::optional option = get>(std::forward(key)); + optional option = get>(std::forward(key)); if (option) { return static_cast(option.value()); } @@ -12730,7 +12736,7 @@ namespace sol { template decltype(auto) traverse_get(Keys&&... keys) const { auto pp = stack::push_pop::value>(*this); - return traverse_get_optional(meta::is_specialization_of>(), std::forward(keys)...); + return traverse_get_optional(meta::is_optional>(), std::forward(keys)...); } template @@ -13164,11 +13170,11 @@ namespace sol { load_status err; template - decltype(auto) tagged_get(types>) const { + decltype(auto) tagged_get(types>) const { if (!valid()) { - return sol::optional(nullopt); + return optional(nullopt); } - return stack::get>(L, index); + return stack::get>(L, index); } template @@ -13181,20 +13187,20 @@ namespace sol { return stack::get(L, index); } - sol::optional tagged_get(types>) const { + optional tagged_get(types>) const { if (valid()) { return nullopt; } - return sol::error(detail::direct_error, stack::get(L, index)); + return error(detail::direct_error, stack::get(L, index)); } - sol::error tagged_get(types) const { + error tagged_get(types) const { #ifdef SOL_CHECK_ARGUMENTS if (valid()) { type_panic(L, index, type_of(L, index), type::none); } #endif // Check Argument Safety - return sol::error(detail::direct_error, stack::get(L, index)); + return error(detail::direct_error, stack::get(L, index)); } public: diff --git a/sol.hpp b/sol.hpp index 15c24214..b1f62d66 100644 --- a/sol.hpp +++ b/sol.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/as_args.hpp b/sol/as_args.hpp index 2b5092cc..123d3a00 100644 --- a/sol/as_args.hpp +++ b/sol/as_args.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/call.hpp b/sol/call.hpp index f6a3bb11..2abca3e0 100644 --- a/sol/call.hpp +++ b/sol/call.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility.hpp b/sol/compatibility.hpp index f63b1c24..5a1c5d58 100644 --- a/sol/compatibility.hpp +++ b/sol/compatibility.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility/5.0.0.h b/sol/compatibility/5.0.0.h index 549badba..0a03949c 100644 --- a/sol/compatibility/5.0.0.h +++ b/sol/compatibility/5.0.0.h @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility/5.1.0.h b/sol/compatibility/5.1.0.h index 7ae6c7ac..7d520d20 100644 --- a/sol/compatibility/5.1.0.h +++ b/sol/compatibility/5.1.0.h @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility/5.2.0.h b/sol/compatibility/5.2.0.h index 60330122..e261e4d8 100644 --- a/sol/compatibility/5.2.0.h +++ b/sol/compatibility/5.2.0.h @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility/5.x.x.h b/sol/compatibility/5.x.x.h index cc7c4835..4a9bb7fb 100644 --- a/sol/compatibility/5.x.x.h +++ b/sol/compatibility/5.x.x.h @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility/5.x.x.inl b/sol/compatibility/5.x.x.inl index f6a7e2a1..89d216cf 100644 --- a/sol/compatibility/5.x.x.inl +++ b/sol/compatibility/5.x.x.inl @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/compatibility/version.hpp b/sol/compatibility/version.hpp index 42b6be91..2153488d 100644 --- a/sol/compatibility/version.hpp +++ b/sol/compatibility/version.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/container_usertype_metatable.hpp b/sol/container_usertype_metatable.hpp index 8aec6e36..013eeb82 100644 --- a/sol/container_usertype_metatable.hpp +++ b/sol/container_usertype_metatable.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/coroutine.hpp b/sol/coroutine.hpp index 17294aa5..17f06b96 100644 --- a/sol/coroutine.hpp +++ b/sol/coroutine.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/debug.hpp b/sol/debug.hpp index 08180051..ff780721 100644 --- a/sol/debug.hpp +++ b/sol/debug.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/demangle.hpp b/sol/demangle.hpp index 0a3c7818..da738d58 100644 --- a/sol/demangle.hpp +++ b/sol/demangle.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/deprecate.hpp b/sol/deprecate.hpp index c0877e1f..6a31ef8b 100644 --- a/sol/deprecate.hpp +++ b/sol/deprecate.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/environment.hpp b/sol/environment.hpp index f11dae5c..b9c1ec10 100644 --- a/sol/environment.hpp +++ b/sol/environment.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/error.hpp b/sol/error.hpp index 1e262d87..46ad1c95 100644 --- a/sol/error.hpp +++ b/sol/error.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function.hpp b/sol/function.hpp index cd04f8de..4d660187 100644 --- a/sol/function.hpp +++ b/sol/function.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_result.hpp b/sol/function_result.hpp index 4e4da128..c66c2563 100644 --- a/sol/function_result.hpp +++ b/sol/function_result.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_types.hpp b/sol/function_types.hpp index 058c21a2..91e4cea7 100644 --- a/sol/function_types.hpp +++ b/sol/function_types.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_types_core.hpp b/sol/function_types_core.hpp index e6682d57..ea2de557 100644 --- a/sol/function_types_core.hpp +++ b/sol/function_types_core.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_types_overloaded.hpp b/sol/function_types_overloaded.hpp index 9591297d..4f5ca780 100644 --- a/sol/function_types_overloaded.hpp +++ b/sol/function_types_overloaded.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_types_stateful.hpp b/sol/function_types_stateful.hpp index aa79dadb..ab5c7f10 100644 --- a/sol/function_types_stateful.hpp +++ b/sol/function_types_stateful.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_types_stateless.hpp b/sol/function_types_stateless.hpp index f97c99d4..c044ea06 100644 --- a/sol/function_types_stateless.hpp +++ b/sol/function_types_stateless.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/function_types_templated.hpp b/sol/function_types_templated.hpp index 80989408..b065c505 100644 --- a/sol/function_types_templated.hpp +++ b/sol/function_types_templated.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/in_place.hpp b/sol/in_place.hpp index 2410fb96..02b3677b 100644 --- a/sol/in_place.hpp +++ b/sol/in_place.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/inheritance.hpp b/sol/inheritance.hpp index f2583495..cbfb12de 100644 --- a/sol/inheritance.hpp +++ b/sol/inheritance.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/load_result.hpp b/sol/load_result.hpp index 443b3d76..becc01a8 100644 --- a/sol/load_result.hpp +++ b/sol/load_result.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -37,11 +37,11 @@ namespace sol { load_status err; template - decltype(auto) tagged_get(types>) const { + decltype(auto) tagged_get(types>) const { if (!valid()) { - return sol::optional(nullopt); + return optional(nullopt); } - return stack::get>(L, index); + return stack::get>(L, index); } template @@ -54,20 +54,20 @@ namespace sol { return stack::get(L, index); } - sol::optional tagged_get(types>) const { + optional tagged_get(types>) const { if (valid()) { return nullopt; } - return sol::error(detail::direct_error, stack::get(L, index)); + return error(detail::direct_error, stack::get(L, index)); } - sol::error tagged_get(types) const { + error tagged_get(types) const { #ifdef SOL_CHECK_ARGUMENTS if (valid()) { type_panic(L, index, type_of(L, index), type::none); } #endif // Check Argument Safety - return sol::error(detail::direct_error, stack::get(L, index)); + return error(detail::direct_error, stack::get(L, index)); } public: diff --git a/sol/object.hpp b/sol/object.hpp index cd8be7d2..d40759eb 100644 --- a/sol/object.hpp +++ b/sol/object.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/object_base.hpp b/sol/object_base.hpp index 76330bc1..de83a2fe 100644 --- a/sol/object_base.hpp +++ b/sol/object_base.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/optional.hpp b/sol/optional.hpp index 16f805e4..1a689b39 100644 --- a/sol/optional.hpp +++ b/sol/optional.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -39,6 +39,12 @@ namespace sol { const nullopt_t nullopt = boost::none; #endif // Boost vs. Better optional + namespace meta { + template + struct is_optional : std::false_type {}; + template + struct is_optional> : std::true_type {}; + } // meta } // sol #endif // SOL_OPTIONAL_HPP diff --git a/sol/optional_implementation.hpp b/sol/optional_implementation.hpp index d036c3a6..e731ac78 100644 --- a/sol/optional_implementation.hpp +++ b/sol/optional_implementation.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/overload.hpp b/sol/overload.hpp index 316a3322..68ee1e45 100644 --- a/sol/overload.hpp +++ b/sol/overload.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/property.hpp b/sol/property.hpp index f1ed4bd6..68a04c77 100644 --- a/sol/property.hpp +++ b/sol/property.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/protect.hpp b/sol/protect.hpp index 42655c6b..7d15e8e6 100644 --- a/sol/protect.hpp +++ b/sol/protect.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/protected_function.hpp b/sol/protected_function.hpp index c876f2e3..e3d63008 100644 --- a/sol/protected_function.hpp +++ b/sol/protected_function.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/protected_function_result.hpp b/sol/protected_function_result.hpp index 9fce5753..a4185960 100644 --- a/sol/protected_function_result.hpp +++ b/sol/protected_function_result.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -38,11 +38,11 @@ namespace sol { call_status err; template - decltype(auto) tagged_get(types>) const { + decltype(auto) tagged_get(types>) const { if (!valid()) { - return sol::optional(nullopt); + return optional(nullopt); } - return stack::get>(L, index); + return stack::get>(L, index); } template diff --git a/sol/proxy.hpp b/sol/proxy.hpp index 5cd8b5e1..b206bd71 100644 --- a/sol/proxy.hpp +++ b/sol/proxy.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -81,7 +81,7 @@ namespace sol { template decltype(auto) get_or(T&& otherwise) const { typedef decltype(get()) U; - sol::optional option = get>(); + optional option = get>(); if (option) { return static_cast(option.value()); } @@ -90,7 +90,7 @@ namespace sol { template decltype(auto) get_or(D&& otherwise) const { - sol::optional option = get>(); + optional option = get>(); if (option) { return static_cast(option.value()); } diff --git a/sol/proxy_base.hpp b/sol/proxy_base.hpp index f3e56007..470b80ba 100644 --- a/sol/proxy_base.hpp +++ b/sol/proxy_base.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/raii.hpp b/sol/raii.hpp index c7b20a69..1176ef93 100644 --- a/sol/raii.hpp +++ b/sol/raii.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/reference.hpp b/sol/reference.hpp index 987524d9..d6adb4f3 100644 --- a/sol/reference.hpp +++ b/sol/reference.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/resolve.hpp b/sol/resolve.hpp index acd372dd..6382747d 100644 --- a/sol/resolve.hpp +++ b/sol/resolve.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/simple_usertype_metatable.hpp b/sol/simple_usertype_metatable.hpp index 22c4740f..d721ded9 100644 --- a/sol/simple_usertype_metatable.hpp +++ b/sol/simple_usertype_metatable.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack.hpp b/sol/stack.hpp index c65fa30f..bcd6afdc 100644 --- a/sol/stack.hpp +++ b/sol/stack.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_check.hpp b/sol/stack_check.hpp index a4005878..4fe575aa 100644 --- a/sol/stack_check.hpp +++ b/sol/stack_check.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_check_get.hpp b/sol/stack_check_get.hpp index 728d7d9a..643b0234 100644 --- a/sol/stack_check_get.hpp +++ b/sol/stack_check_get.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_core.hpp b/sol/stack_core.hpp index 7ae7c495..2095a8ff 100644 --- a/sol/stack_core.hpp +++ b/sol/stack_core.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_field.hpp b/sol/stack_field.hpp index 6e247621..10c0c9f1 100644 --- a/sol/stack_field.hpp +++ b/sol/stack_field.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_get.hpp b/sol/stack_get.hpp index 89c08685..b148772e 100644 --- a/sol/stack_get.hpp +++ b/sol/stack_get.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_guard.hpp b/sol/stack_guard.hpp index 54e359fe..5e679f3c 100644 --- a/sol/stack_guard.hpp +++ b/sol/stack_guard.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_pop.hpp b/sol/stack_pop.hpp index f6970131..c2b27738 100644 --- a/sol/stack_pop.hpp +++ b/sol/stack_pop.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_probe.hpp b/sol/stack_probe.hpp index 62185f4f..e12214c3 100644 --- a/sol/stack_probe.hpp +++ b/sol/stack_probe.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_proxy.hpp b/sol/stack_proxy.hpp index 487e4b29..022fdc71 100644 --- a/sol/stack_proxy.hpp +++ b/sol/stack_proxy.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_push.hpp b/sol/stack_push.hpp index 29cb20ac..3ed75888 100644 --- a/sol/stack_push.hpp +++ b/sol/stack_push.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/stack_reference.hpp b/sol/stack_reference.hpp index ccbc50a8..f26a53c5 100644 --- a/sol/stack_reference.hpp +++ b/sol/stack_reference.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/state.hpp b/sol/state.hpp index d579d64b..5d0aa841 100644 --- a/sol/state.hpp +++ b/sol/state.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/state_view.hpp b/sol/state_view.hpp index 4592b2d4..4cd365b9 100644 --- a/sol/state_view.hpp +++ b/sol/state_view.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/string_shim.hpp b/sol/string_shim.hpp index 73aa8164..c4451583 100644 --- a/sol/string_shim.hpp +++ b/sol/string_shim.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/table.hpp b/sol/table.hpp index b4e47b8b..d5dc801a 100644 --- a/sol/table.hpp +++ b/sol/table.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/table_core.hpp b/sol/table_core.hpp index f1d37556..19e0cff6 100644 --- a/sol/table_core.hpp +++ b/sol/table_core.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -79,15 +79,15 @@ namespace sol { -> decltype(stack::pop>(nullptr)) { typedef decltype(stack::pop>(nullptr)) Tup; return Tup( - traverse_get_optional(meta::is_specialization_of>(), detail::forward_get<0>(keys)), - traverse_get_optional(meta::is_specialization_of>(), detail::forward_get<1>(keys)), - traverse_get_optional(meta::is_specialization_of>(), detail::forward_get(keys))... + traverse_get_optional(meta::is_optional>(), detail::forward_get<0>(keys)), + traverse_get_optional(meta::is_optional>(), detail::forward_get<1>(keys)), + traverse_get_optional(meta::is_optional>(), detail::forward_get(keys))... ); } template decltype(auto) tuple_get(types, std::index_sequence, Keys&& keys) const { - return traverse_get_optional(meta::is_specialization_of>(), detail::forward_get(keys)); + return traverse_get_optional(meta::is_optional>(), detail::forward_get(keys)); } template @@ -228,7 +228,7 @@ namespace sol { template decltype(auto) get_or(Key&& key, T&& otherwise) const { typedef decltype(get("")) U; - sol::optional option = get>(std::forward(key)); + optional option = get>(std::forward(key)); if (option) { return static_cast(option.value()); } @@ -237,7 +237,7 @@ namespace sol { template decltype(auto) get_or(Key&& key, D&& otherwise) const { - sol::optional option = get>(std::forward(key)); + optional option = get>(std::forward(key)); if (option) { return static_cast(option.value()); } @@ -247,7 +247,7 @@ namespace sol { template decltype(auto) traverse_get(Keys&&... keys) const { auto pp = stack::push_pop::value>(*this); - return traverse_get_optional(meta::is_specialization_of>(), std::forward(keys)...); + return traverse_get_optional(meta::is_optional>(), std::forward(keys)...); } template diff --git a/sol/table_iterator.hpp b/sol/table_iterator.hpp index c1102a8e..33367907 100644 --- a/sol/table_iterator.hpp +++ b/sol/table_iterator.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/thread.hpp b/sol/thread.hpp index 5e57ad1d..5050bbf8 100644 --- a/sol/thread.hpp +++ b/sol/thread.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/tie.hpp b/sol/tie.hpp index 9157ed00..ae82983a 100644 --- a/sol/tie.hpp +++ b/sol/tie.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/traits.hpp b/sol/traits.hpp index 1ed95a16..3be532a5 100644 --- a/sol/traits.hpp +++ b/sol/traits.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/tuple.hpp b/sol/tuple.hpp index 1f9a80be..35b1b9c4 100644 --- a/sol/tuple.hpp +++ b/sol/tuple.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/types.hpp b/sol/types.hpp index 85451a37..8fdff702 100644 --- a/sol/types.hpp +++ b/sol/types.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/userdata.hpp b/sol/userdata.hpp index d49c4a2f..d6a52636 100644 --- a/sol/userdata.hpp +++ b/sol/userdata.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/usertype.hpp b/sol/usertype.hpp index a42fbc7c..b0475e11 100644 --- a/sol/usertype.hpp +++ b/sol/usertype.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/usertype_metatable.hpp b/sol/usertype_metatable.hpp index 381c81bf..15d081fc 100644 --- a/sol/usertype_metatable.hpp +++ b/sol/usertype_metatable.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -251,7 +251,7 @@ namespace sol { if (is_simple) { simple_map& sm = stack::get>(L, upvalue_index(1)); function_map& functions = sm.functions; - sol::optional maybeaccessor = stack::get>(L, 2); + optional maybeaccessor = stack::get>(L, 2); if (!maybeaccessor) { return; } @@ -269,7 +269,7 @@ namespace sol { bool mustindex = umc.mustindex; if (!mustindex) return; - sol::optional maybeaccessor = stack::get>(L, 2); + optional maybeaccessor = stack::get>(L, 2); if (!maybeaccessor) { return; } diff --git a/sol/usertype_traits.hpp b/sol/usertype_traits.hpp index a776a16f..85c21bfa 100644 --- a/sol/usertype_traits.hpp +++ b/sol/usertype_traits.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/variadic_args.hpp b/sol/variadic_args.hpp index 38d25822..ff0d93dd 100644 --- a/sol/variadic_args.hpp +++ b/sol/variadic_args.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/sol/wrapper.hpp b/sol/wrapper.hpp index 7e38d39f..9cb439f3 100644 --- a/sol/wrapper.hpp +++ b/sol/wrapper.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in