Merge branch 'develop' into sol3

This commit is contained in:
ThePhD 2018-10-25 01:53:46 -04:00
commit a1951a79f2
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
2 changed files with 3 additions and 5 deletions

View File

@ -49,12 +49,9 @@ More examples are given in the examples directory [here](https://github.com/TheP
## Supporting
You can [donate to support Sol and the project](https://www.paypal.me/LMeneide), which is always appreciated! This is a time-consuming effort, so individuals who donate get to:
Help the project grow on [patreon](https://www.patreon.com/thephd)!
- steer the direction and time spent on sol
- get a role on the Discord server
- get their name put up in the CONTRIBUTORS list
- put something of their choice on sol2's README or the documentation's front page
You can also [donate to support Sol](https://www.paypal.me/LMeneide), which is always appreciated! There are reward tiers for patrons on patreon, too!
You can also help out the library by submitting pull requests to fix anything or add anything you think would be helpful! This includes making small, useful examples of something you haven't seen, or fixing typos and bad code in the documentation.

View File

@ -434,6 +434,7 @@ namespace sol {
const void* pointer() const noexcept {
int si = push();
const void* vp = lua_topointer(lua_state(), -si);
lua_pop(this->lua_state(), si);
return vp;
}