diff options
| author | David Robillard <d@drobilla.net> | 2016-10-01 19:53:04 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-10-01 19:53:04 -0400 |
| commit | f7bbd02b6bfdb3d09146488cfeebf26722abaa0c (patch) | |
| tree | 5429ce634eb5ffe5b83dbf83578f62db577c4a61 /src/server/Engine.cpp | |
| parent | 97bfcd3b24e7ae385cdec84363f9c868f580beb3 (diff) | |
| parent | c73c877f8bd09e0d5a6663ea5ba32a54465f5376 (diff) | |
| download | ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.tar.gz ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.tar.bz2 ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.zip | |
Merge branch 'master' into parallel
Diffstat (limited to 'src/server/Engine.cpp')
| -rw-r--r-- | src/server/Engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index a8c51f20..0b468ce1 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -62,8 +62,8 @@ using namespace std; namespace Ingen { namespace Server { -thread_local unsigned ThreadManager::flags(0); -bool ThreadManager::single_threaded(true); +INGEN_THREAD_LOCAL unsigned ThreadManager::flags(0); +bool ThreadManager::single_threaded(true); Engine::Engine(Ingen::World* world) : _world(world) |