Merge branch 'C++11'

dougbinks · dougbinks · commit 346f8477ae9d · 2019-10-20T23:31:01.000+01:00
diff --git a/src/TaskScheduler.cpp b/src/TaskScheduler.cpp
@@ -563,7 +563,7 @@ void    TaskScheduler::WaitforTask( const ICompletable* pCompletable_, enki::Tas
             }
 
         }
-        SafeCallback( m_ProfilerCallbacks.waitForTaskCompleteSuspendStop, threadNum );
+        SafeCallback( m_ProfilerCallbacks.waitForTaskCompleteStop, threadNum );
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ void TaskScheduler::WaitforTask( const ICompletable* pCompletable_, enki::Tas`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`}`
`566`		`- SafeCallback( m_ProfilerCallbacks.waitForTaskCompleteSuspendStop, threadNum );`
	`566`	`+ SafeCallback( m_ProfilerCallbacks.waitForTaskCompleteStop, threadNum );`
`567`	`567`	`}`
`568`	`568`	`else`
`569`	`569`	`{`