Merge branch 'release-5.x' into develop

2016-10-07 09:13:19 -06:00
parent 7cc100e3d7 665125665a
commit b091439567
8 changed files with 66 additions and 53 deletions
--- a/unittests/multithreaded_test.cpp
+++ b/unittests/multithreaded_test.cpp
@@ -16,7 +16,7 @@ int expected_value(int num_iters)
  return i;
 }

-void do_work(chaiscript::ChaiScript &c, const size_t id)
+void do_work(chaiscript::ChaiScript_Basic &c, const size_t id)
 {
  try{
    std::stringstream ss;