diff options
author | Mike Buland <eichlan@xagasoft.com> | 2010-04-27 17:07:55 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2010-04-27 17:07:55 +0000 |
commit | 1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c (patch) | |
tree | 3ea239424e33edfc8d9b80aa6b923d944cd0bfa1 /src/tests | |
parent | 801e7de1f85656746d832508baf4583907826420 (diff) | |
download | libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.tar.gz libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.tar.bz2 libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.tar.xz libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.zip |
The Bu::Ito thread class has changed the rules on the run function. It no
longer returns anything, that's fine, it's in a class, but it also is protected
now. That doesn't really effect child classes much, they can make run public,
but I reccomend protected to avoid confusion.
Diffstat (limited to '')
-rw-r--r-- | src/tests/itoheap.cpp | 4 | ||||
-rw-r--r-- | src/tests/itoqueue1.cpp | 8 | ||||
-rw-r--r-- | src/tests/itoqueue2.cpp | 8 | ||||
-rw-r--r-- | src/tests/socketblock.cpp | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/src/tests/itoheap.cpp b/src/tests/itoheap.cpp index 92bf3cf..347f1e0 100644 --- a/src/tests/itoheap.cpp +++ b/src/tests/itoheap.cpp | |||
@@ -23,7 +23,7 @@ public: | |||
23 | { | 23 | { |
24 | } | 24 | } |
25 | 25 | ||
26 | void *run() | 26 | void run() |
27 | { | 27 | { |
28 | for( int j = 0; j < 10; j++ ) | 28 | for( int j = 0; j < 10; j++ ) |
29 | { | 29 | { |
@@ -39,8 +39,6 @@ public: | |||
39 | printf("Nothing yet...\n"); | 39 | printf("Nothing yet...\n"); |
40 | } | 40 | } |
41 | } | 41 | } |
42 | |||
43 | return NULL; | ||
44 | } | 42 | } |
45 | 43 | ||
46 | Bu::ItoHeap<int> hInt; | 44 | Bu::ItoHeap<int> hInt; |
diff --git a/src/tests/itoqueue1.cpp b/src/tests/itoqueue1.cpp index 815216d..a034c87 100644 --- a/src/tests/itoqueue1.cpp +++ b/src/tests/itoqueue1.cpp | |||
@@ -19,7 +19,7 @@ public: | |||
19 | { | 19 | { |
20 | } | 20 | } |
21 | 21 | ||
22 | void *run() | 22 | void run() |
23 | { | 23 | { |
24 | for( int i = 0; i < 10; i++ ) | 24 | for( int i = 0; i < 10; i++ ) |
25 | { | 25 | { |
@@ -35,8 +35,6 @@ public: | |||
35 | } | 35 | } |
36 | usleep( (int)(((double)rand())/((double)RAND_MAX)*2000000.0) ); | 36 | usleep( (int)(((double)rand())/((double)RAND_MAX)*2000000.0) ); |
37 | } | 37 | } |
38 | |||
39 | return NULL; | ||
40 | } | 38 | } |
41 | 39 | ||
42 | private: | 40 | private: |
@@ -54,7 +52,7 @@ public: | |||
54 | { | 52 | { |
55 | } | 53 | } |
56 | 54 | ||
57 | void *run() | 55 | void run() |
58 | { | 56 | { |
59 | for( int i = 0; i < 11; i++ ) | 57 | for( int i = 0; i < 11; i++ ) |
60 | { | 58 | { |
@@ -62,8 +60,6 @@ public: | |||
62 | q.enqueue( new std::string( strbase ) ); | 60 | q.enqueue( new std::string( strbase ) ); |
63 | printf("[%d] write: %s\n", id, strbase ); | 61 | printf("[%d] write: %s\n", id, strbase ); |
64 | } | 62 | } |
65 | |||
66 | return NULL; | ||
67 | } | 63 | } |
68 | 64 | ||
69 | private: | 65 | private: |
diff --git a/src/tests/itoqueue2.cpp b/src/tests/itoqueue2.cpp index d1f20a4..b11aa32 100644 --- a/src/tests/itoqueue2.cpp +++ b/src/tests/itoqueue2.cpp | |||
@@ -19,7 +19,7 @@ public: | |||
19 | { | 19 | { |
20 | } | 20 | } |
21 | 21 | ||
22 | void *run() | 22 | void run() |
23 | { | 23 | { |
24 | for( int i = 0; i < 10; i++ ) | 24 | for( int i = 0; i < 10; i++ ) |
25 | { | 25 | { |
@@ -35,8 +35,6 @@ public: | |||
35 | delete pStr; | 35 | delete pStr; |
36 | } | 36 | } |
37 | } | 37 | } |
38 | |||
39 | return NULL; | ||
40 | } | 38 | } |
41 | 39 | ||
42 | private: | 40 | private: |
@@ -54,7 +52,7 @@ public: | |||
54 | { | 52 | { |
55 | } | 53 | } |
56 | 54 | ||
57 | void *run() | 55 | void run() |
58 | { | 56 | { |
59 | for( int i = 0; i < 11; i++ ) | 57 | for( int i = 0; i < 11; i++ ) |
60 | { | 58 | { |
@@ -62,8 +60,6 @@ public: | |||
62 | printf("[%d] write: %s\n", id, strbase ); | 60 | printf("[%d] write: %s\n", id, strbase ); |
63 | q.enqueue( new std::string( strbase ) ); | 61 | q.enqueue( new std::string( strbase ) ); |
64 | } | 62 | } |
65 | |||
66 | return NULL; | ||
67 | } | 63 | } |
68 | 64 | ||
69 | private: | 65 | private: |
diff --git a/src/tests/socketblock.cpp b/src/tests/socketblock.cpp index 3d50aa0..a1ea18d 100644 --- a/src/tests/socketblock.cpp +++ b/src/tests/socketblock.cpp | |||
@@ -19,7 +19,7 @@ public: | |||
19 | { | 19 | { |
20 | } | 20 | } |
21 | 21 | ||
22 | virtual void *run() | 22 | virtual void run() |
23 | { | 23 | { |
24 | Bu::Socket c = s.accept( 45, 0 ); | 24 | Bu::Socket c = s.accept( 45, 0 ); |
25 | printf("TstServer: Accetped connection.\n"); fflush( stdout ); | 25 | printf("TstServer: Accetped connection.\n"); fflush( stdout ); |
@@ -33,8 +33,6 @@ public: | |||
33 | 33 | ||
34 | printf("TstServer: Closing connection...\n"); fflush( stdout ); | 34 | printf("TstServer: Closing connection...\n"); fflush( stdout ); |
35 | c.close(); | 35 | c.close(); |
36 | |||
37 | return NULL; | ||
38 | } | 36 | } |
39 | 37 | ||
40 | Bu::ServerSocket s; | 38 | Bu::ServerSocket s; |