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 branch 'develop' of github.com:ChaiScript/ChaiScript into develop

Browse Source
This commit is contained in:
Jason Turner 2018-04-01 11:07:11 -06:00
commit 9a670d79fc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/language/chaiscript_engine.hpp
View File

@ -223,7 +223,7 @@ namespace chaiscript
return std::string(); return std::string();
} else { } else {
std::vector<char> v(static_cast<size_t>(size)); std::vector<char> v(static_cast<size_t>(size));
infile.read(&v[0], size); infile.read(&v[0], static_cast<std::streamsize>(size));
return std::string(v.begin(), v.end()); return std::string(v.begin(), v.end());
} }
} }

2
unittests/static_chaiscript.cpp
View File

@ -1,5 +1,7 @@
#ifndef CHAISCRIPT_NO_THREADS
#define CHAISCRIPT_NO_THREADS #define CHAISCRIPT_NO_THREADS
#endif
/// ChaiScript as a static is unsupported with thread support enabled /// ChaiScript as a static is unsupported with thread support enabled
/// ///