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

[ci skip] relevant changes to docs

Browse Source
This commit is contained in:
ThePhD 2016-08-24 12:22:51 -04:00
parent 81ffb3f334
commit 16cd699208
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/index.rst
View File

@ -22,7 +22,7 @@ get going:
---------- ----------
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 1
:name: mastertoc :name: mastertoc
tutorial/all-the-things tutorial/all-the-things

2
docs/source/tutorial/tutorial-top.rst
View File

@ -1,7 +1,7 @@
tutorial tutorial
======== ========
Take some time to learn the framework with thse tutorials. But, if you need to get going FAST, try using the :doc:`quick 'n' dirty<all-the-things>` approach and your browser's / editors search function. It will also serve you well to look at all the `examples`_, which have recently gotten a bit of an overhaul to contain more relevant work. Take some time to learn the framework with thse tutorials. But, if you need to get going FAST, try using the :doc:`quick 'n' dirty<all-the-things>` approach and your browser's / editors search function. It will also serve you well to look at all the `examples`_, which have recently gotten a bit of an overhaul to contain more relevant working examples.
.. toctree:: .. toctree::

17
single/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2016-08-24 13:16:37.429596 UTC // Generated 2016-08-24 16:22:00.354090 UTC
// This header was generated with sol 2.12.0 (revision 1e62e3c) // This header was generated with sol v2.11.7 (revision 81ffb3f)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -3253,6 +3253,8 @@ namespace sol {
class reference; class reference;
class stack_reference; class stack_reference;
template <typename Table, typename Key>
struct proxy;
template<typename T> template<typename T>
class usertype; class usertype;
template <bool, typename T> template <bool, typename T>
@ -3471,6 +3473,13 @@ namespace sol {
|| meta::is_specialization_of<std::pair, meta::unqualified_t<T>>::value || meta::is_specialization_of<std::pair, meta::unqualified_t<T>>::value
> { }; > { };
template <typename T>
struct is_lua_reference : std::integral_constant<bool,
std::is_base_of<reference, meta::unqualified_t<T>>::value
|| std::is_base_of<stack_reference, meta::unqualified_t<T>>::value
|| meta::is_specialization_of<proxy, meta::unqualified_t<T>>::value
> { };
template <typename T> template <typename T>
struct is_lua_primitive<T*> : std::true_type {}; struct is_lua_primitive<T*> : std::true_type {};
template <typename T> template <typename T>
@ -9205,12 +9214,12 @@ namespace sol {
return *this; return *this;
} }
template<typename U, meta::enable<meta::is_callable<meta::unwrap_unqualified_t<U>>> = meta::enabler> template<typename U, meta::enable<meta::neg<is_lua_reference<meta::unwrap_unqualified_t<U>>>, meta::is_callable<meta::unwrap_unqualified_t<U>>> = meta::enabler>
proxy& operator=(U&& other) { proxy& operator=(U&& other) {
return set_function(std::forward<U>(other)); return set_function(std::forward<U>(other));
} }
template<typename U, meta::disable<meta::is_callable<meta::unwrap_unqualified_t<U>>> = meta::enabler> template<typename U, meta::disable<meta::neg<is_lua_reference<meta::unwrap_unqualified_t<U>>>, meta::is_callable<meta::unwrap_unqualified_t<U>>> = meta::enabler>
proxy& operator=(U&& other) { proxy& operator=(U&& other) {
return set(std::forward<U>(other)); return set(std::forward<U>(other));
} }