Jason Turner
|
52bb08f4d5
|
Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
include/chaiscript/dispatchkit/bootstrap_stl.hpp
include/chaiscript/language/chaiscript_engine.hpp
include/chaiscript/language/chaiscript_prelude.hpp
|
2014-02-17 16:31:16 -07:00 |
|
Jason Turner
|
71348b7967
|
Update copyrights to 2014 and some comment formatting
|
2014-02-17 16:24:29 -07:00 |
|
Jason Turner
|
73b3762f7a
|
Get ChaiScript ported to MSVC 2013. See Notes in code.
|
2013-11-02 07:42:06 -06:00 |
|
Jason Turner
|
1708024372
|
Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
include/chaiscript/chaiscript_threading.hpp
include/chaiscript/dispatchkit/boxed_value.hpp
include/chaiscript/dispatchkit/proxy_functions_detail.hpp
samples/example.cpp
src/test_module.cpp
unittests/multithreaded_test.cpp
|
2013-05-27 08:48:59 -06:00 |
|
Jason Turner
|
101225aa68
|
- Fix legit threading issue which shows itself on clang / macos mostly
- Fix all warnings that I can / ignore those caused by boost
|
2013-05-26 22:47:23 -06:00 |
|
Jason Turner
|
85ba42849b
|
Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
include/chaiscript/dispatchkit/bootstrap_stl.hpp
include/chaiscript/language/chaiscript_parser.hpp
unittests/multithreaded_test.cpp
|
2012-11-16 16:32:39 -07:00 |
|
Jason Turner
|
afd27a4b01
|
Fix errors and warnings found on VisualStudio 2005
|
2012-11-16 12:27:41 -07:00 |
|
Jason Turner
|
c2934caad6
|
Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
include/chaiscript/language/chaiscript_engine.hpp
src/multithreaded.cpp
|
2012-07-13 13:32:29 -06:00 |
|
Jason Turner
|
9f309fcbe9
|
Add tests for multithreaded features #55
|
2012-07-10 15:10:09 -06:00 |
|