coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-06 16:57:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #562 from BerndAmend/develop

Browse Source 
Update readme.txt and fix json namespace clash with nlohmann/json

Fixes #486, #506
This commit is contained in:
Rob Loach 2021-05-24 17:56:06 -04:00 committed by GitHub
commit 855c3ced88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/utility/json.hpp
View File

@ -19,7 +19,7 @@
#include <variant> #include <variant>
#include <vector> #include <vector>
namespace json { namespace chaiscript::json {
using std::enable_if; using std::enable_if;
using std::initializer_list; using std::initializer_list;
using std::is_convertible; using std::is_convertible;
@ -593,6 +593,6 @@ namespace json {
return JSONParser::parse_next(str, offset); return JSONParser::parse_next(str, offset);
} }
} // End Namespace json } // namespace chaiscript::json
#endif #endif

13
readme.md
View File

@ -7,11 +7,6 @@ Master Status: [![Linux Build Status](https://travis-ci.org/ChaiScript/ChaiScrip
Develop Status: [![Linux Build Status](https://travis-ci.org/ChaiScript/ChaiScript.png?branch=develop)](https://travis-ci.org/ChaiScript/ChaiScript) [![Windows Build status](https://ci.appveyor.com/api/projects/status/6u3r4s81kkjqmsqw/branch/develop?svg=true)](https://ci.appveyor.com/project/lefticus/chaiscript/branch/develop) [![codecov.io](http://codecov.io/github/ChaiScript/ChaiScript/coverage.svg?branch=develop)](http://codecov.io/github/ChaiScript/ChaiScript?branch=develop) Develop Status: [![Linux Build Status](https://travis-ci.org/ChaiScript/ChaiScript.png?branch=develop)](https://travis-ci.org/ChaiScript/ChaiScript) [![Windows Build status](https://ci.appveyor.com/api/projects/status/6u3r4s81kkjqmsqw/branch/develop?svg=true)](https://ci.appveyor.com/project/lefticus/chaiscript/branch/develop) [![codecov.io](http://codecov.io/github/ChaiScript/ChaiScript/coverage.svg?branch=develop)](http://codecov.io/github/ChaiScript/ChaiScript?branch=develop)
<a href="https://scan.coverity.com/projects/5297">
<img alt="Coverity Scan Build Status"
src="https://img.shields.io/coverity/scan/5297.svg"/>
</a>
ChaiScript ChaiScript
http://www.chaiscript.com http://www.chaiscript.com
@ -43,10 +38,8 @@ languages:
Requirements Requirements
============ ============
ChaiScript requires a C++14 compiler to build with support for variadic ChaiScript requires a C++17 compiler to build with support for variadic
templates. It has been tested with gcc 4.9 and clang 3.6 (with libcxx). templates. It has been tested with gcc 7 and clang 6 (with libcxx).
For more information see the build
[dashboard](http://chaiscript.com/ChaiScript-BuildResults/index.html).
Installation using vcpkg Installation using vcpkg
======================== ========================
@ -72,7 +65,7 @@ Usage
loadable module. A second option is to compile the library into your code, loadable module. A second option is to compile the library into your code,
see below for an example. see below for an example.
Once instantiated, the engine is ready to start running ChaiScript source. You Once instantiated, the engine is ready to start running ChaiScript source. You
have two main options for processing ChaiScript source: a line at a time using have two main options for processing ChaiScript source: a line at a time using
`chai.eval(string)` and a file at a time using `chai.eval_file(fname)` `chai.eval(string)` and a file at a time using `chai.eval_file(fname)`