generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix NO_THREADS related issues

Browse Source
This commit is contained in:
Jason Turner 2009-12-06 05:12:02 +00:00
parent e601de9d18
commit 4457df9ff5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@ -13,6 +13,7 @@
#include "type_info.hpp" #include "type_info.hpp"
#include <string> #include <string>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
#include "proxy_functions_detail.hpp" #include "proxy_functions_detail.hpp"

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

@ -348,8 +348,10 @@ namespace chaiscript
*/ */
State get_state() State get_state()
{ {
#ifndef CHAISCRIPT_NO_THREADS
boost::lock_guard<boost::recursive_mutex> l(use_mutex); boost::lock_guard<boost::recursive_mutex> l(use_mutex);
boost::shared_lock<boost::shared_mutex> l2(mutex); boost::shared_lock<boost::shared_mutex> l2(mutex);
#endif
State s; State s;
s.loaded_files = loaded_files; s.loaded_files = loaded_files;
@ -363,8 +365,10 @@ namespace chaiscript
*/ */
void set_state(const State &t_state) void set_state(const State &t_state)
{ {
#ifndef CHAISCRIPT_NO_THREADS
boost::lock_guard<boost::recursive_mutex> l(use_mutex); boost::lock_guard<boost::recursive_mutex> l(use_mutex);
boost::shared_lock<boost::shared_mutex> l2(mutex); boost::shared_lock<boost::shared_mutex> l2(mutex);
#endif
loaded_files = t_state.loaded_files; loaded_files = t_state.loaded_files;
active_loaded_modules = t_state.active_loaded_modules; active_loaded_modules = t_state.active_loaded_modules;