diff options
author | 2015-01-08 11:02:40 -0800 | |
---|---|---|
committer | 2015-01-14 10:05:07 -0800 | |
commit | 20974edc14f43822084bf584c3d19fe23e80247b (patch) | |
tree | c1b6a8c2f2ad90993d76b5b39f305438d9a2fd21 /fish_tests.cpp | |
parent | 6e2132e01f08123436011f4bed07548d23784560 (diff) |
Use iothread_perform variant that doesn't take a completion callback
Removes some ugly NULL casts
Diffstat (limited to 'fish_tests.cpp')
-rw-r--r-- | fish_tests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fish_tests.cpp b/fish_tests.cpp index a1f984f3..28089bda 100644 --- a/fish_tests.cpp +++ b/fish_tests.cpp @@ -526,7 +526,7 @@ static void test_iothread(void) double start = timef(); for (int i=0; i < iterations; i++) { - int thread_count = iothread_perform(test_iothread_thread_call, (void (*)(int *, int))NULL, int_ptr); + int thread_count = iothread_perform(test_iothread_thread_call, int_ptr); max_achieved_thread_count = std::max(max_achieved_thread_count, thread_count); } @@ -776,7 +776,7 @@ static void test_1_cancellation(const wchar_t *src) shared_ptr<io_buffer_t> out_buff(io_buffer_t::create(STDOUT_FILENO, io_chain_t())); const io_chain_t io_chain(out_buff); test_cancellation_info_t ctx = {pthread_self(), 0.25 /* seconds */ }; - iothread_perform(signal_main, (void (*)(test_cancellation_info_t *, int))NULL, &ctx); + iothread_perform(signal_main, &ctx); parser_t::principal_parser().eval(src, io_chain, TOP); out_buff->read(); if (out_buff->out_buffer_size() != 0) @@ -2424,7 +2424,7 @@ static void test_universal() const int threads = 16; for (int i=0; i < threads; i++) { - iothread_perform(test_universal_helper, (void (*)(int *, int))NULL, new int(i)); + iothread_perform(test_universal_helper, new int(i)); } iothread_drain_all(); |