From bdbc8e418b0a3cc9598c8bc96d1ba7a082e94c1f Mon Sep 17 00:00:00 2001 From: Davis King Date: Fri, 22 Jul 2016 16:22:57 -0400 Subject: [PATCH] Renamed something to avoid name clash with standard library. --- examples/threads_ex.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/threads_ex.cpp b/examples/threads_ex.cpp index 504026659..f0f1e914f 100644 --- a/examples/threads_ex.cpp +++ b/examples/threads_ex.cpp @@ -35,7 +35,7 @@ signaler count_signaler(count_mutex); // This is a signaler we will use to sign // unlock count_mutex for you. -void thread (void*) +void test_thread (void*) { // just sleep for a second dlib::sleep(1000); @@ -65,7 +65,7 @@ int main() // Create some threads. This 0 we are passing in here is the argument that gets // passed to the thread function (a void pointer) but we aren't using it in this // example program so i'm just using 0. - create_new_thread(thread,0); + create_new_thread(test_thread,0); } cout << "Done creating threads, now we wait for them to end" << endl;