StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

fix up variadic_results and change pointer_like traits to not fall prey to implict conversions as easily

Browse Source
This commit is contained in:
ThePhD 2019-07-01 02:13:34 -04:00
parent b08387d947
commit 1ab57fc11e
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -136,7 +136,7 @@ install(EXPORT sol2
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
install(DIRECTORY include/
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sol")
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sol/")
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"

5
include/sol/pointer_like.hpp
View File

@ -35,10 +35,13 @@ namespace sol {
namespace meta_detail {
template <typename T>
using is_dereferenceable_test = decltype(*std::declval<T>());
template <typename T>
using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
}
template <typename T>
using is_pointer_like = std::integral_constant<bool, !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_dereferenceable_test, T>)>;
using is_pointer_like = std::integral_constant<bool, !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
template <typename T>
constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;

4
include/sol/variadic_results.hpp
View File

@ -40,7 +40,9 @@ namespace sol {
using base_t = std::vector<object, Al>;
public:
basic_variadic_results(function_result fr) : base_t() {
basic_variadic_results() : base_t() {}
basic_variadic_results(unsafe_function_result fr) : base_t() {
this->reserve(fr.return_count());
this->insert(this->cend(), fr.begin(), fr.end());
}

4
single/include/sol/forward.hpp
View File

@ -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 2019-06-29 13:51:15.310645 UTC
// This header was generated with sol v3.0.2 (revision da789b0)
// Generated 2019-07-01 06:13:08.602308 UTC
// This header was generated with sol v3.0.2 (revision b08387d)
// https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

13
single/include/sol/sol.hpp
View File

@ -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 2019-06-29 13:51:15.029920 UTC
// This header was generated with sol v3.0.2 (revision da789b0)
// Generated 2019-07-01 06:13:07.719429 UTC
// This header was generated with sol v3.0.2 (revision b08387d)
// https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP
@ -1187,10 +1187,13 @@ namespace sol {
namespace meta_detail {
template <typename T>
using is_dereferenceable_test = decltype(*std::declval<T>());
template <typename T>
using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
}
template <typename T>
using is_pointer_like = std::integral_constant<bool, !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_dereferenceable_test, T>)>;
using is_pointer_like = std::integral_constant<bool, !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
template <typename T>
constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;
@ -25700,7 +25703,9 @@ namespace sol {
using base_t = std::vector<object, Al>;
public:
basic_variadic_results(function_result fr) : base_t() {
basic_variadic_results() : base_t() {}
basic_variadic_results(unsafe_function_result fr) : base_t() {
this->reserve(fr.return_count());
this->insert(this->cend(), fr.begin(), fr.end());
}