diff --git a/.travis.yml b/.travis.yml index 28659acb..fb0d3c0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,10 +33,8 @@ before_install: - sudo apt install -y git script: -- export SOL2_DIR=${TRAVIS_BUILD_DIR} -- sudo docker image pull thephd/sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION} -- sudo docker run --rm --interactive --tty --name "sol2.test" -v "${SOL2_DIR}:/root/sol2" --env "CI=${CI}" --env "PLATFORM=${PLATFORM}" --env "LUA_VERSION=${LUA_VERSION}" --env "GCC_VERSION=${GCC_VERSION}" --env "LLVM_VERSION=${LLVM_VERSION}" thephd/sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION} -- sudo docker rmi $(sudo docker image ls -q) +- chmod +x ./scripts/ci.linux.sh +- ./scripts/ci.linux.sh matrix: fast_finish: true diff --git a/scripts/ci.linux.sh b/scripts/ci.linux.sh new file mode 100644 index 00000000..d3c696ff --- /dev/null +++ b/scripts/ci.linux.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env zsh + +# # # # sol2 +# The MIT License (MIT) +# +# 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 +# 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. + +export SOL2_DIR=${TRAVIS_BUILD_DIR} +sudo docker image pull thephd/sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION} +sudo docker run --rm --interactive --tty --name "sol2.test" -v "${SOL2_DIR}:/root/sol2" --env "CI=${CI}" --env "PLATFORM=${PLATFORM}" --env "LUA_VERSION=${LUA_VERSION}" --env "GCC_VERSION=${GCC_VERSION}" --env "LLVM_VERSION=${LLVM_VERSION}" thephd/sol2:gcc-${GCC_VERSION}_llvm-${LLVM_VERSION} +sudo docker rmi $(sudo docker image ls -q) diff --git a/scripts/run.osx.sh b/scripts/run.osx.sh index d7608461..7dc5c72d 100644 --- a/scripts/run.osx.sh +++ b/scripts/run.osx.sh @@ -1,3 +1,28 @@ +#!/usr/bin/env zsh + +# # # # sol2 +# The MIT License (MIT) +# +# 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 +# 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. + +export SOL2_DIR=${TRAVIS_BUILD_DIR} mkdir -p build-sol2/Debug mkdir -p build-sol2/Release cd build-sol2 diff --git a/single.py b/single.py index 0fda4916..2d76b9f9 100644 --- a/single.py +++ b/single.py @@ -33,7 +33,7 @@ os.chdir(script_path) intro = """// The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 4e295049..4f0bb874 100644 --- a/single/sol/sol.hpp +++ b/single/sol/sol.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_forward.hpp b/single/sol/sol_forward.hpp index 52930905..cbbf0e68 100644 --- a/single/sol/sol_forward.hpp +++ b/single/sol/sol_forward.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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.hpp b/sol.hpp index 405b7ceb..da464f26 100644 --- a/sol.hpp +++ b/sol.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 2e9ff228..ad49be21 100644 --- a/sol/as_args.hpp +++ b/sol/as_args.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_returns.hpp b/sol/as_returns.hpp index ce830e2d..5ff8b877 100644 --- a/sol/as_returns.hpp +++ b/sol/as_returns.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/bind_traits.hpp b/sol/bind_traits.hpp index 11993735..5be85240 100644 --- a/sol/bind_traits.hpp +++ b/sol/bind_traits.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 0c5de80d..08d0a91d 100644 --- a/sol/call.hpp +++ b/sol/call.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 a7f7d0c6..6e9c7d1e 100644 --- a/sol/compatibility.hpp +++ b/sol/compatibility.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 266f8de5..2e4e3ed4 100644 --- a/sol/compatibility/version.hpp +++ b/sol/compatibility/version.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_traits.hpp b/sol/container_traits.hpp index d5fa54c4..df72c878 100644 --- a/sol/container_traits.hpp +++ b/sol/container_traits.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 519b243c..61c37cd7 100644 --- a/sol/container_usertype_metatable.hpp +++ b/sol/container_usertype_metatable.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 e75efce6..512b62ed 100644 --- a/sol/coroutine.hpp +++ b/sol/coroutine.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 5451ec3f..186aeb86 100644 --- a/sol/debug.hpp +++ b/sol/debug.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 eb5ce0a0..78a559f9 100644 --- a/sol/demangle.hpp +++ b/sol/demangle.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 61696e92..5c62243a 100644 --- a/sol/deprecate.hpp +++ b/sol/deprecate.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 7820622a..852f327b 100644 --- a/sol/environment.hpp +++ b/sol/environment.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 15c5ef92..db571c94 100644 --- a/sol/error.hpp +++ b/sol/error.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_handler.hpp b/sol/error_handler.hpp index 4365ad2d..b63620eb 100644 --- a/sol/error_handler.hpp +++ b/sol/error_handler.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/feature_test.hpp b/sol/feature_test.hpp index 91a8a602..39edf3bb 100644 --- a/sol/feature_test.hpp +++ b/sol/feature_test.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 @@ -166,7 +166,7 @@ #endif #endif // avoiding nil defines / keywords -#ifdef SOL_USE_BOOST +#ifdef SOL_USE_BOOST #ifndef SOL_UNORDERED_MAP_COMPATIBLE_HASH #define SOL_UNORDERED_MAP_COMPATIBLE_HASH #endif // SOL_UNORDERED_MAP_COMPATIBLE_HASH diff --git a/sol/filters.hpp b/sol/filters.hpp index e19ddd9e..a29d3ca3 100644 --- a/sol/filters.hpp +++ b/sol/filters.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/forward.hpp b/sol/forward.hpp index bdfa0692..9efba669 100644 --- a/sol/forward.hpp +++ b/sol/forward.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/forward_detail.hpp b/sol/forward_detail.hpp index 024f50c9..63598892 100644 --- a/sol/forward_detail.hpp +++ b/sol/forward_detail.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 ea66b699..8f4874fa 100644 --- a/sol/function.hpp +++ b/sol/function.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 eff39052..73474b77 100644 --- a/sol/function_result.hpp +++ b/sol/function_result.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 702959e2..d1ad6942 100644 --- a/sol/function_types.hpp +++ b/sol/function_types.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 f9db65b2..61980470 100644 --- a/sol/function_types_core.hpp +++ b/sol/function_types_core.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 aae844ff..b0bdb22e 100644 --- a/sol/function_types_overloaded.hpp +++ b/sol/function_types_overloaded.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 2e54636f..375682f2 100644 --- a/sol/function_types_stateful.hpp +++ b/sol/function_types_stateful.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 68d7cc07..eafba249 100644 --- a/sol/function_types_stateless.hpp +++ b/sol/function_types_stateless.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 8e161938..13b8eabe 100644 --- a/sol/function_types_templated.hpp +++ b/sol/function_types_templated.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 e6888a33..eb306c1d 100644 --- a/sol/in_place.hpp +++ b/sol/in_place.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 1080d2e7..e886688d 100644 --- a/sol/inheritance.hpp +++ b/sol/inheritance.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 8a2bfab6..1d396f31 100644 --- a/sol/load_result.hpp +++ b/sol/load_result.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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.hpp b/sol/object.hpp index bdfdfab5..42844ca4 100644 --- a/sol/object.hpp +++ b/sol/object.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 43496247..f1345d72 100644 --- a/sol/object_base.hpp +++ b/sol/object_base.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 14c5785d..8ddfec02 100644 --- a/sol/optional.hpp +++ b/sol/optional.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_implementation.hpp b/sol/optional_implementation.hpp index 147414fb..8a8fd937 100644 --- a/sol/optional_implementation.hpp +++ b/sol/optional_implementation.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 8b59c87b..2a9107ea 100644 --- a/sol/overload.hpp +++ b/sol/overload.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 a8b5680c..25ea7f4d 100644 --- a/sol/property.hpp +++ b/sol/property.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 19303568..7a58130d 100644 --- a/sol/protect.hpp +++ b/sol/protect.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 6c6c776d..9ab08a6c 100644 --- a/sol/protected_function.hpp +++ b/sol/protected_function.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 8eebfbb2..d8128297 100644 --- a/sol/protected_function_result.hpp +++ b/sol/protected_function_result.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_handler.hpp b/sol/protected_handler.hpp index 64721c69..1158f69f 100644 --- a/sol/protected_handler.hpp +++ b/sol/protected_handler.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 @@ -22,15 +22,15 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef SOL_PROTECTED_HANDLER_HPP -#define SOL_PROTECTED_HANDLER_HPP - +#define SOL_PROTECTED_HANDLER_HPP + #include "reference.hpp" #include "stack.hpp" #include "protected_function_result.hpp" #include "unsafe_function.hpp" #include - -namespace sol { + +namespace sol { namespace detail { inline const char(&default_handler_name())[9]{ static const char name[9] = "sol.\xF0\x9F\x94\xA9"; @@ -102,7 +102,7 @@ namespace sol { lua_setglobal(L, default_handler_name()); } } - } // namespace detail -} // namespace sol - -#endif // SOL_PROTECTED_HANDLER_HPP + } // namespace detail +} // namespace sol + +#endif // SOL_PROTECTED_HANDLER_HPP diff --git a/sol/proxy.hpp b/sol/proxy.hpp index e2a24124..fbeaa805 100644 --- a/sol/proxy.hpp +++ b/sol/proxy.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/proxy_base.hpp b/sol/proxy_base.hpp index b52ecb50..740a00ae 100644 --- a/sol/proxy_base.hpp +++ b/sol/proxy_base.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 0c647dac..22573163 100644 --- a/sol/raii.hpp +++ b/sol/raii.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 fefc07fd..8fc35ead 100644 --- a/sol/reference.hpp +++ b/sol/reference.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 520273b7..ad977a0f 100644 --- a/sol/resolve.hpp +++ b/sol/resolve.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 9c893f1b..cb50a7d3 100644 --- a/sol/simple_usertype_metatable.hpp +++ b/sol/simple_usertype_metatable.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 c49978a0..53439bda 100644 --- a/sol/stack.hpp +++ b/sol/stack.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 f3165d32..691f2a58 100644 --- a/sol/stack_check.hpp +++ b/sol/stack_check.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 949365a9..87997e1c 100644 --- a/sol/stack_check_get.hpp +++ b/sol/stack_check_get.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 282645e1..eaf011b4 100644 --- a/sol/stack_core.hpp +++ b/sol/stack_core.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 fa66ad31..7d6eb899 100644 --- a/sol/stack_field.hpp +++ b/sol/stack_field.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 7cd879d1..ab2b03d4 100644 --- a/sol/stack_get.hpp +++ b/sol/stack_get.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 b35ab383..e61b9dfe 100644 --- a/sol/stack_guard.hpp +++ b/sol/stack_guard.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_iterator.hpp b/sol/stack_iterator.hpp index 69b1b6f5..a39a3ff3 100644 --- a/sol/stack_iterator.hpp +++ b/sol/stack_iterator.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 a86eb0eb..ee6fe44a 100644 --- a/sol/stack_pop.hpp +++ b/sol/stack_pop.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 a9105db5..e6f5fbb4 100644 --- a/sol/stack_probe.hpp +++ b/sol/stack_probe.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 d0a3f6e5..05776c9b 100644 --- a/sol/stack_proxy.hpp +++ b/sol/stack_proxy.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_base.hpp b/sol/stack_proxy_base.hpp index bbc28533..ede32c7d 100644 --- a/sol/stack_proxy_base.hpp +++ b/sol/stack_proxy_base.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 feba83ac..4e27c23e 100644 --- a/sol/stack_push.hpp +++ b/sol/stack_push.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 11c929b9..16a22836 100644 --- a/sol/stack_reference.hpp +++ b/sol/stack_reference.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 7fb6379c..197bfa29 100644 --- a/sol/state.hpp +++ b/sol/state.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 01e18b4b..f24146fb 100644 --- a/sol/state_view.hpp +++ b/sol/state_view.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_view.hpp b/sol/string_view.hpp index c5f4d5e9..dff2888c 100644 --- a/sol/string_view.hpp +++ b/sol/string_view.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 a26953af..92830669 100644 --- a/sol/table.hpp +++ b/sol/table.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 201be5e2..e866f7a6 100644 --- a/sol/table_core.hpp +++ b/sol/table_core.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_iterator.hpp b/sol/table_iterator.hpp index 13259000..fdfe6be4 100644 --- a/sol/table_iterator.hpp +++ b/sol/table_iterator.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 6472ff51..c6d1625e 100644 --- a/sol/thread.hpp +++ b/sol/thread.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 20a9468e..63735bd9 100644 --- a/sol/tie.hpp +++ b/sol/tie.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 a6bfea0a..78ba92d0 100644 --- a/sol/traits.hpp +++ b/sol/traits.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 9085b53c..25067956 100644 --- a/sol/tuple.hpp +++ b/sol/tuple.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 ebc96e19..c6d35d70 100644 --- a/sol/types.hpp +++ b/sol/types.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/unsafe_function.hpp b/sol/unsafe_function.hpp index 9ce29cb6..eed55651 100644 --- a/sol/unsafe_function.hpp +++ b/sol/unsafe_function.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/unsafe_function_result.hpp b/sol/unsafe_function_result.hpp index f0ce5056..3a952681 100644 --- a/sol/unsafe_function_result.hpp +++ b/sol/unsafe_function_result.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 ddde03a1..7c6df40f 100644 --- a/sol/userdata.hpp +++ b/sol/userdata.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 4d112aaf..b19d1eb4 100644 --- a/sol/usertype.hpp +++ b/sol/usertype.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_core.hpp b/sol/usertype_core.hpp index e9d2b088..c558a83e 100644 --- a/sol/usertype_core.hpp +++ b/sol/usertype_core.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 35053a91..e98ba477 100644 --- a/sol/usertype_metatable.hpp +++ b/sol/usertype_metatable.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_traits.hpp b/sol/usertype_traits.hpp index d6e756cd..18f58a6d 100644 --- a/sol/usertype_traits.hpp +++ b/sol/usertype_traits.hpp @@ -1,8 +1,8 @@ -// sol2 - +// sol2 + // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 2dde5203..67937c1b 100644 --- a/sol/variadic_args.hpp +++ b/sol/variadic_args.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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_results.hpp b/sol/variadic_results.hpp index 810a995b..e1bbec62 100644 --- a/sol/variadic_results.hpp +++ b/sol/variadic_results.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 d04b8658..c390a60b 100644 --- a/sol/wrapper.hpp +++ b/sol/wrapper.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_container_semantics.cpp b/tests/test_container_semantics.cpp index f67cc7d7..b3423383 100644 --- a/tests/test_container_semantics.cpp +++ b/tests/test_container_semantics.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_containers.cpp b/tests/test_containers.cpp index d28db504..2af01c0c 100644 --- a/tests/test_containers.cpp +++ b/tests/test_containers.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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 @@ -134,28 +134,28 @@ public: } }; -struct my_vec : public std::vector { - typedef std::vector base_t; - using base_t::base_t; -}; - -namespace sol { - template <> - struct is_container : std::true_type {}; - - template <> - struct container_traits { - static auto begin(lua_State*, my_vec& self) { - return self.begin(); - } - static auto end(lua_State*, my_vec& self) { - return self.end(); - } - static std::ptrdiff_t index_adjustment(lua_State*, my_vec&) { - return 0; - } - }; - +struct my_vec : public std::vector { + typedef std::vector base_t; + using base_t::base_t; +}; + +namespace sol { + template <> + struct is_container : std::true_type {}; + + template <> + struct container_traits { + static auto begin(lua_State*, my_vec& self) { + return self.begin(); + } + static auto end(lua_State*, my_vec& self) { + return self.end(); + } + static std::ptrdiff_t index_adjustment(lua_State*, my_vec&) { + return 0; + } + }; + } // namespace sol auto test_table_return_one() { @@ -1262,11 +1262,11 @@ end } TEST_CASE("containers/custom indexing", "allow containers to set a custom indexing offset") { - sol::state lua; - lua.open_libraries(sol::lib::base); - - lua["c"] = my_vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - + sol::state lua; + lua.open_libraries(sol::lib::base); + + lua["c"] = my_vec{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + auto result1 = lua.safe_script("for i=0,9 do assert(i == c[i]) end", sol::script_pass_on_error); REQUIRE(result1.valid()); auto result2 = lua.safe_script("assert(c[10] == nil)", sol::script_pass_on_error); diff --git a/tests/test_coroutines.cpp b/tests/test_coroutines.cpp index 8a234dc8..3cffc1f8 100644 --- a/tests/test_coroutines.cpp +++ b/tests/test_coroutines.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_customizations.cpp b/tests/test_customizations.cpp index d2dba8b1..cafe140e 100644 --- a/tests/test_customizations.cpp +++ b/tests/test_customizations.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_environments.cpp b/tests/test_environments.cpp index 970f1d31..171fc0e4 100644 --- a/tests/test_environments.cpp +++ b/tests/test_environments.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_filters.cpp b/tests/test_filters.cpp index 991a8191..d5185a98 100644 --- a/tests/test_filters.cpp +++ b/tests/test_filters.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_functions.cpp b/tests/test_functions.cpp index 812d86ce..b2c876d7 100644 --- a/tests/test_functions.cpp +++ b/tests/test_functions.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_gc.cpp b/tests/test_gc.cpp index 785879ef..0d6e2b2a 100644 --- a/tests/test_gc.cpp +++ b/tests/test_gc.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_inheritance.cpp b/tests/test_inheritance.cpp index c3919395..710aedb2 100644 --- a/tests/test_inheritance.cpp +++ b/tests/test_inheritance.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_large_integer.cpp b/tests/test_large_integer.cpp index fe4ac06a..474ea5ff 100644 --- a/tests/test_large_integer.cpp +++ b/tests/test_large_integer.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_operators.cpp b/tests/test_operators.cpp index 2fa9959b..9a2e08d7 100644 --- a/tests/test_operators.cpp +++ b/tests/test_operators.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_overflow.cpp b/tests/test_overflow.cpp index b8c34066..cdb83ef3 100644 --- a/tests/test_overflow.cpp +++ b/tests/test_overflow.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_plain_types.cpp b/tests/test_plain_types.cpp index 3004a4a7..7570863b 100644 --- a/tests/test_plain_types.cpp +++ b/tests/test_plain_types.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_proxies.cpp b/tests/test_proxies.cpp index 1fcb75ca..e4dfb336 100644 --- a/tests/test_proxies.cpp +++ b/tests/test_proxies.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_simple_usertypes.cpp b/tests/test_simple_usertypes.cpp index 503d2cda..6f8d6180 100644 --- a/tests/test_simple_usertypes.cpp +++ b/tests/test_simple_usertypes.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_sol.hpp b/tests/test_sol.hpp index 4f2f916a..9f4b7d31 100644 --- a/tests/test_sol.hpp +++ b/tests/test_sol.hpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_state.cpp b/tests/test_state.cpp index 5b821a97..61c9f478 100644 --- a/tests/test_state.cpp +++ b/tests/test_state.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_storage.cpp b/tests/test_storage.cpp index f228a3a4..48739492 100644 --- a/tests/test_storage.cpp +++ b/tests/test_storage.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_strings.cpp b/tests/test_strings.cpp index 51c1ccb0..4db3371d 100644 --- a/tests/test_strings.cpp +++ b/tests/test_strings.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_tables.cpp b/tests/test_tables.cpp index e0700260..9c87de8a 100644 --- a/tests/test_tables.cpp +++ b/tests/test_tables.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_usertypes.cpp b/tests/test_usertypes.cpp index c3e7ec1b..587bb418 100644 --- a/tests/test_usertypes.cpp +++ b/tests/test_usertypes.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_utility.cpp b/tests/test_utility.cpp index 3e1cb1a3..438c2502 100644 --- a/tests/test_utility.cpp +++ b/tests/test_utility.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/test_variadics.cpp b/tests/test_variadics.cpp index 4a51eeb6..0bc1947a 100644 --- a/tests/test_variadics.cpp +++ b/tests/test_variadics.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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/tests/tests.cpp b/tests/tests.cpp index 0cf37c9e..e0aac7b5 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -2,7 +2,7 @@ // The MIT License (MIT) -// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2018 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