Author: matt
Date: 2011-05-30 10:34:08 -0700 (Mon, 30 May 2011)
New Revision: 8766
Log:
123: remove fltk3 namespacing from 'threads' test code. Only elements of the
library should use fltk3:: as a prefix
Modified:
branches/branch-3.0/test/threads.cxx
branches/branch-3.0/test/threads.h
Modified: branches/branch-3.0/test/threads.cxx
===================================================================
--- branches/branch-3.0/test/threads.cxx 2011-05-30 17:26:30 UTC (rev
8765)
+++ branches/branch-3.0/test/threads.cxx 2011-05-30 17:34:08 UTC (rev
8766)
@@ -37,7 +37,7 @@
# include <stdio.h>
# include <math.h>
-fltk3::Thread prime_thread;
+Thread prime_thread;
fltk3::Browser *browser1, *browser2;
fltk3::ValueOutput *value1, *value2;
@@ -145,15 +145,15 @@
// Start threads...
// One thread displaying in one browser
- fltk3::create_thread(prime_thread, prime_func, browser1);
+ create_thread(prime_thread, prime_func, browser1);
// Several threads displaying in another browser
- fltk3::create_thread(prime_thread, prime_func, browser2);
- fltk3::create_thread(prime_thread, prime_func, browser2);
- fltk3::create_thread(prime_thread, prime_func, browser2);
- fltk3::create_thread(prime_thread, prime_func, browser2);
- fltk3::create_thread(prime_thread, prime_func, browser2);
- fltk3::create_thread(prime_thread, prime_func, browser2);
+ create_thread(prime_thread, prime_func, browser2);
+ create_thread(prime_thread, prime_func, browser2);
+ create_thread(prime_thread, prime_func, browser2);
+ create_thread(prime_thread, prime_func, browser2);
+ create_thread(prime_thread, prime_func, browser2);
+ create_thread(prime_thread, prime_func, browser2);
fltk3::run();
Modified: branches/branch-3.0/test/threads.h
===================================================================
--- branches/branch-3.0/test/threads.h 2011-05-30 17:26:30 UTC (rev 8765)
+++ branches/branch-3.0/test/threads.h 2011-05-30 17:34:08 UTC (rev 8766)
@@ -48,44 +48,32 @@
# include <pthread.h>
-namespace fltk3 {
-
typedef pthread_t Thread;
static int create_thread(Thread& t, void *(*f) (void *), void* p) {
return pthread_create((pthread_t*)&t, 0, f, p);
} // create_thread
-} // namespace fltk3
-
# elif defined(WIN32) && !defined(__WATCOMC__) // Use Windows threading...
# include <windows.h>
# include <process.h>
-namespace fltk3 {
-
typedef unsigned long Thread;
static int create_thread(Thread& t, void *(*f) (void *), void* p) {
return t = (Thread)_beginthread((void( __cdecl * )( void * ))f, 0, p);
} // create_thread
-} // namespace fltk3
-
# elif defined(__WATCOMC__)
# include <process.h>
-namespace fltk3 {
-
typedef unsigned long Thread;
static int create_thread(Thread& t, void *(*f) (void *), void* p) {
return t = (Thread)_beginthread((void(* )( void * ))f, 32000, p);
} // create_thread
-} // namespace fltk3
-
# endif // !HAVE_PTHREAD_H
#endif // !Threads_h
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
