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

Prepare for release.

Browse Source
This commit is contained in:
ThePhD 2016-11-05 23:17:31 -04:00
parent 3e77a77ddc
commit db7b4f22f2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
## Sol 2.14 ## Sol 2.15
[![Join the chat at https://gitter.im/chat-sol2/Lobby](https://badges.gitter.im/chat-sol2/Lobby.svg)](https://gitter.im/chat-sol2/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Join the chat at https://gitter.im/chat-sol2/Lobby](https://badges.gitter.im/chat-sol2/Lobby.svg)](https://gitter.im/chat-sol2/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

4
docs/source/conf.py
View File

@ -59,9 +59,9 @@ author = 'ThePhD'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.14' version = '2.15'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.14.12' release = '2.15.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

6
docs/source/index.rst
View File

@ -7,8 +7,8 @@
:target: https://github.com/ThePhD/sol2 :target: https://github.com/ThePhD/sol2
:alt: sol2 repository :alt: sol2 repository
Sol 2.14 Sol |version|
======== =============
a fast, simple C++ and Lua Binding a fast, simple C++ and Lua Binding
---------------------------------- ----------------------------------
@ -19,7 +19,7 @@ When you need to hit the ground running with Lua and C++, `Sol`_ is the go-to fr
:alt: build status :alt: build status
.. image:: https://badges.gitter.im/chat-sol2/Lobby.svg .. image:: https://badges.gitter.im/chat-sol2/Lobby.svg
target: https://gitter.im/chat-sol2/Lobby :target: https://gitter.im/chat-sol2/Lobby
:alt: chat about sol2 on gitter :alt: chat about sol2 on gitter

4
test_containers.cpp
View File

@ -300,14 +300,14 @@ end
// Set a global variable called // Set a global variable called
// "arr" to be a vector of 5 lements // "arr" to be a vector of 5 lements
lua["arr"] = std::vector<int>{ 2, 4, 6, 8, 10 }; lua["arr"] = std::vector<int>{ 2, 4, 6, 8, 10 };
lua["map"] = std::unordered_map<int, int>{ { 1 , 2 },{ 2, 4 },{ 3, 6 },{ 4, 8 },{ 5, 10 } }; lua["map"] = std::map<int, int>{ { 1 , 2 },{ 2, 4 },{ 3, 6 },{ 4, 8 },{ 5, 10 } };
lua["set"] = std::set<int>{ 2, 4, 6, 8, 10 }; lua["set"] = std::set<int>{ 2, 4, 6, 8, 10 };
std::vector<int>& arr = lua["arr"]; std::vector<int>& arr = lua["arr"];
std::map<int, int>& map = lua["map"]; std::map<int, int>& map = lua["map"];
std::set<int>& set = lua["set"]; std::set<int>& set = lua["set"];
REQUIRE(arr.size() == 5); REQUIRE(arr.size() == 5);
REQUIRE(map.size() == 5); REQUIRE(map.size() == 5);
REQUIRE(set.size() == 4); REQUIRE(set.size() == 5);
g(lua["set"]); g(lua["set"]);
g(lua["arr"]); g(lua["arr"]);