🐛 Fix #1144 for now

include/sol/call.hpp

@@ -125,14 +125,20 @@ namespace sol {
 		template <typename T, bool checked, bool clean_stack>
 		struct constructor_match {
 			T* obj_;
+			stack::stack_detail::undefined_metatable* p_umf_;
 
-			constructor_match(T* o) : obj_(o) {
+			constructor_match(T* obj_ptr, stack::stack_detail::undefined_metatable& umf) : obj_(obj_ptr), p_umf_(&umf) {
 			}
 
 			template <typename Fx, std::size_t I, typename... R, typename... Args>
 			int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start) const {
 				detail::default_construct func {};
-				return stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, obj_);
+				int result = stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, this->obj_);
+				// construct userdata table
+				// SPECIFICALLY, after we've created it successfully.
+				// If the constructor exits for any reason we have to break things down...
+				(*this->p_umf_)();
+				return result;
 			}
 		};
 
@@ -317,11 +323,10 @@ namespace sol {
 			T* obj = detail::usertype_allocate<T>(L);
 			reference userdataref(L, -1);
 			stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
-			umf();
 
 			// put userdata at the first index
 			lua_insert(L, 1);
-			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, 1 + static_cast<int>(syntax));
+			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj, umf), L, argcount, 1 + static_cast<int>(syntax));
 
 			userdataref.push();
 			return 1;
@@ -649,13 +654,16 @@ namespace sol {
 				argcount -= static_cast<int>(syntax);
 
 				T* obj = detail::usertype_allocate<T>(L);
-				reference userdataref(L, -1);
+				stack_reference userdataref(L, -1);
 				stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
-				umf();
 
 				// put userdata at the first index
 				lua_insert(L, 1);
-				construct_match<T, Args...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
+				// Because of the way constructors work,
+				// we have to kill the data, but only if the cosntructor is successfulyl invoked...
+				// if it's not successfully invoked and we panic,
+				// we cannot actually deallcoate/delete the data.
+				construct_match<T, Args...>(constructor_match<T, checked, clean_stack>(obj, umf), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
 
 				userdataref.push();
 				return 1;

tests/config_tests/function_pointers/CMakeLists.txt

@@ -22,7 +22,10 @@
 
 # # # # sol2 tests - simple regression tests
 
-file(GLOB test_sources source/*.cpp)
+file(GLOB test_sources
+	LIST_DIRECTORIES FALSE
+	CONFIGURE_DEPENDS
+	source/*.cpp)
 source_group(sources FILES ${test_sources})
 
 function(CREATE_TEST test_target_name test_name target_sol)

tests/inclusion/CMakeLists.txt

@@ -22,12 +22,15 @@
 
 # # # # sol2 tests - header compilation tests
 
-file(GLOB_RECURSE SOL2_COMPILE_TEST_SOURCES source/*.cpp)
+file(GLOB_RECURSE SOL2_COMPILE_TEST_SOURCES
+	LIST_DIRECTORIES FALSE
+	CONFIGURE_DEPENDS
+	source/*.cpp)
 source_group(compile_test_sources FILES "${SOL2_COMPILE_TEST_SOURCES}")
 
 function(CREATE_TEST test_target_name test_name target_sol)
 	if (test_name MATCHES ".single")
-		add_executable(${test_target_name} "source/main.cpp" "source/forward.cpp" "source/sol.cpp")
+		add_executable(${test_target_name} "source/main.cpp" "source/forward.cpp" "source/sol.cpp" "source/config.cpp")
 	else()
 		add_executable(${test_target_name} "${SOL2_COMPILE_TEST_SOURCES}")
 	endif()
@@ -37,7 +40,10 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		EXPORT_NAME sol2::${test_name})
 	target_link_libraries(${test_target_name} 
 		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol} ${CMAKE_DL_LIBS})
-	
+	target_compile_options(${test_target_name}
+		PRIVATE
+		SOL_ENABLE_INTEROP=1
+		SOL_ALL_SAFETIES_ON=1)
 	if (MSVC)
 		target_compile_options(${test_target_name}
 			PRIVATE /std:c++latest /EHsc "$<$<CONFIG:Debug>:/MDd>"

tests/inclusion/source/as_args.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/as_args.hpp>

tests/inclusion/source/as_returns.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/as_returns.hpp>

tests/inclusion/source/base_traits.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/base_traits.hpp>

tests/inclusion/source/bind_traits.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/bind_traits.hpp>

tests/inclusion/source/bytecode.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/bytecode.hpp>

tests/inclusion/source/call.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/call.hpp>

tests/inclusion/source/compatibility.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/compatibility.hpp>

tests/inclusion/source/config.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/config.hpp>

tests/inclusion/source/coroutine.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/coroutine.hpp>

tests/inclusion/source/debug.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/debug.hpp>

tests/inclusion/source/demangle.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/demangle.hpp>

tests/inclusion/source/deprecate.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/deprecate.hpp>

tests/inclusion/source/ebco.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/ebco.hpp>

tests/inclusion/source/environment.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/environment.hpp>

tests/inclusion/source/error_handler.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/error_handler.hpp>

tests/inclusion/source/forward.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/forward.hpp>

tests/inclusion/source/forward_detail.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/forward_detail.hpp>

tests/inclusion/source/function.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function.hpp>

tests/inclusion/source/function_result.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_result.hpp>

tests/inclusion/source/function_types.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_types.hpp>

tests/inclusion/source/function_types_core.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_types_core.hpp>

tests/inclusion/source/function_types_overloaded.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_types_overloaded.hpp>

tests/inclusion/source/function_types_stateful.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_types_stateful.hpp>

tests/inclusion/source/function_types_stateless.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_types_stateless.hpp>

tests/inclusion/source/function_types_templated.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/function_types_templated.hpp>

tests/inclusion/source/in_place.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/in_place.hpp>

tests/inclusion/source/inheritance.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/inheritance.hpp>

tests/inclusion/source/load_result.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/load_result.hpp>

tests/inclusion/source/lua_table.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/lua_table.hpp>

tests/inclusion/source/lua_value.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/lua_value.hpp>

tests/inclusion/source/main.cpp

@@ -21,8 +21,6 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/sol.hpp>
 
 int main() {

tests/inclusion/source/make_reference.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/make_reference.hpp>

tests/inclusion/source/metatable.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/metatable.hpp>

tests/inclusion/source/object.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/object.hpp>

tests/inclusion/source/object_base.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/object_base.hpp>

tests/inclusion/source/optional.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/optional.hpp>

tests/inclusion/source/optional_implementation.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/optional_implementation.hpp>

tests/inclusion/source/overload.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/overload.hpp>

tests/inclusion/source/packaged_coroutine.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/packaged_coroutine.hpp>

tests/inclusion/source/pairs_iterator.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/pairs_iterator.hpp>

tests/inclusion/source/pointer_like.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/pointer_like.hpp>

tests/inclusion/source/policies.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/policies.hpp>

tests/inclusion/source/property.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/property.hpp>

tests/inclusion/source/protect.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/protect.hpp>

tests/inclusion/source/protected_function.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/protected_function.hpp>

tests/inclusion/source/protected_function_result.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/protected_function_result.hpp>

tests/inclusion/source/protected_handler.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/protected_handler.hpp>

tests/inclusion/source/proxy.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/table_proxy.hpp>

tests/inclusion/source/proxy_base.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/proxy_base.hpp>

tests/inclusion/source/raii.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/raii.hpp>

tests/inclusion/source/reference.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/reference.hpp>

tests/inclusion/source/resolve.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/resolve.hpp>

tests/inclusion/source/sol.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/sol.hpp>

tests/inclusion/source/sol_defines.hpp

@@ -1,34 +0,0 @@
-// sol2
-
-// The MIT License (MIT)
-
-// Copyright (c) 2013-2021 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
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#ifndef SOL_TESTS_SOL_DEFINES_HPP
-#define SOL_TESTS_SOL_DEFINES_HPP
-
-#if !defined(SOL_ALL_SAFETIES_ON)
-#define SOL_ALL_SAFETIES_ON 1
-#endif // SOL_ALL_SAFETIES_ON
-#if !defined(SOL_ENABLE_INTEROP)
-#define SOL_ENABLE_INTEROP 1
-#endif // SOL_ENABLE_INTEROP
-
-#endif // SOL_TESTS_SOL_DEFINES_HPP

tests/inclusion/source/stack.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack.hpp>

tests/inclusion/source/stack_check.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_check.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_check_get.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_check_get.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_check_get_qualified.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_check_get_qualified.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_check_get_unqualified.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_check_get_unqualified.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_check_qualified.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_check_qualified.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_check_unqualified.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_check_unqualified.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_core.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_core.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_field.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_field.hpp>

tests/inclusion/source/stack_get.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_get.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_get_qualified.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_get_qualified.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_get_unqualified.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_get_unqualified.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_guard.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_guard.hpp>

tests/inclusion/source/stack_iterator.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_iterator.hpp>

tests/inclusion/source/stack_pop.cpp

@@ -21,7 +21,5 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 //#include <sol/stack_pop.hpp>
 #include <sol/stack.hpp>

tests/inclusion/source/stack_probe.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_probe.hpp>

tests/inclusion/source/stack_proxy.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_proxy.hpp>

tests/inclusion/source/stack_proxy_base.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_proxy_base.hpp>

tests/inclusion/source/stack_push.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_push.hpp>

tests/inclusion/source/stack_reference.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/stack_reference.hpp>

tests/inclusion/source/state_handling.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/state_handling.hpp>

tests/inclusion/source/string_view.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/string_view.hpp>

tests/inclusion/source/table.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/table.hpp>

tests/inclusion/source/table_core.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/table_core.hpp>

tests/inclusion/source/table_iterator.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/table_iterator.hpp>

tests/inclusion/source/thread.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/thread.hpp>

tests/inclusion/source/tie.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/tie.hpp>

tests/inclusion/source/traits.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/traits.hpp>

tests/inclusion/source/trampoline.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/trampoline.hpp>

tests/inclusion/source/tuple.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/tuple.hpp>

tests/inclusion/source/types.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/types.hpp>

tests/inclusion/source/unicode.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/unicode.hpp>

tests/inclusion/source/unique_usertype_traits.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/unique_usertype_traits.hpp>

tests/inclusion/source/unsafe_function.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/unsafe_function.hpp>

tests/inclusion/source/unsafe_function_result.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/unsafe_function_result.hpp>

tests/inclusion/source/userdata.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/userdata.hpp>

tests/inclusion/source/usertype.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype.hpp>

tests/inclusion/source/usertype_container.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype_container.hpp>

tests/inclusion/source/usertype_container_launch.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype_container_launch.hpp>

tests/inclusion/source/usertype_core.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype_core.hpp>

tests/inclusion/source/usertype_proxy.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype_proxy.hpp>

tests/inclusion/source/usertype_storage.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype_storage.hpp>

tests/inclusion/source/usertype_traits.cpp

@@ -21,6 +21,4 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "sol_defines.hpp"
-
 #include <sol/usertype_traits.hpp>