Skip to content

Commit 66e8fb9

Browse files
committed
Fixed compilation with internal task scheduler
Internal task scheduler is now outside of RTC namespace matching the other schedulers.
1 parent 1372ca0 commit 66e8fb9

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

common/tasking/taskschedulerinternal.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
namespace embree
1010
{
11-
RTC_NAMESPACE_BEGIN
12-
1311
static MutexSys g_mutex;
1412
size_t TaskScheduler::g_numThreads = 0;
1513
__thread TaskScheduler* TaskScheduler::g_instance = nullptr;
@@ -399,6 +397,4 @@ namespace embree
399397
dll_export void TaskScheduler::removeScheduler(const Ref<TaskScheduler>& scheduler) {
400398
threadPool->remove(scheduler);
401399
}
402-
403-
RTC_NAMESPACE_END
404400
}

common/tasking/taskschedulerinternal.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818

1919
namespace embree
2020
{
21-
22-
/* The tasking system exports some symbols to be used by the tutorials. Thus we
23-
hide is also in the API namespace when requested. */
24-
RTC_NAMESPACE_BEGIN
25-
2621
struct TaskScheduler : public RefCount
2722
{
2823
ALIGNED_STRUCT_(64);
@@ -375,10 +370,4 @@ namespace embree
375370
static __thread Thread* thread_local_thread;
376371
static ThreadPool* threadPool;
377372
};
378-
379-
RTC_NAMESPACE_END
380-
381-
#if defined(RTC_NAMESPACE)
382-
using RTC_NAMESPACE::TaskScheduler;
383-
#endif
384373
}

0 commit comments

Comments
 (0)