diff options
author | Murray Cumming <murrayc@murrayc.com> | 2015-11-26 10:26:07 +0100 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2015-11-26 10:31:39 +0100 |
commit | eb2117327fa1a74f3f44a4acd227a2c836c48b38 (patch) | |
tree | 2ebb21636f6388ffdbde0dc11b8d8f1153a16cbc /examples | |
parent | 68f0cdac60e5a7c7a567301cea877e49ffd7cbd5 (diff) | |
download | glibmm-eb2117327fa1a74f3f44a4acd227a2c836c48b38.tar.gz |
examples/tests: Use simpler std::thread constructor.
Instead of using a lambda. As suggested by Kjell Ahlstedt:
https://bugzilla.gnome.org/show_bug.cgi?id=757674#c10
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/resolver.cc | 6 | ||||
-rw-r--r-- | examples/network/socket-client.cc | 6 | ||||
-rw-r--r-- | examples/network/socket-server.cc | 6 | ||||
-rw-r--r-- | examples/thread/thread.cc | 14 |
4 files changed, 7 insertions, 25 deletions
diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index e6837b23..57504795 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -209,11 +209,7 @@ start_threaded_lookups (char **argv, int argc) for (auto i = 0; i < argc; i++) { const Glib::ustring arg = argv[i]; - const auto thread = new std::thread( - [arg] - { - lookup_thread(arg); - }); + const auto thread = new std::thread(&lookup_thread, arg); result.push_back(thread); } diff --git a/examples/network/socket-client.cc b/examples/network/socket-client.cc index 9204a259..ebde5b66 100644 --- a/examples/network/socket-client.cc +++ b/examples/network/socket-client.cc @@ -164,11 +164,7 @@ main (int argc, if (cancel_timeout) { cancellable = Gio::Cancellable::create (); - thread = new std::thread( - [cancellable] () - { - cancel_thread(cancellable); - }); + thread = new std::thread(&cancel_thread, cancellable); } loop = Glib::MainLoop::create (); diff --git a/examples/network/socket-server.cc b/examples/network/socket-server.cc index dcca8c5b..43c0e6e2 100644 --- a/examples/network/socket-server.cc +++ b/examples/network/socket-server.cc @@ -152,11 +152,7 @@ main (int argc, if (cancel_timeout) { cancellable = Gio::Cancellable::create (); - thread = new std::thread( - [cancellable] () - { - cancel_thread(cancellable); - }); + thread = new std::thread(&cancel_thread, cancellable); } loop = Glib::MainLoop::create (); diff --git a/examples/thread/thread.cc b/examples/thread/thread.cc index e99de76b..816e7c73 100644 --- a/examples/thread/thread.cc +++ b/examples/thread/thread.cc @@ -112,17 +112,11 @@ int main(int, char**) MessageQueue queue; //TODO: Use std::make_unique() when we use C++14: - const auto producer = std::unique_ptr<std::thread>(new std::thread( - [&queue] () - { - queue.producer(); - })); + const auto producer = std::unique_ptr<std::thread>( + new std::thread(&MessageQueue::producer, &queue)); - const auto consumer = std::unique_ptr<std::thread>(new std::thread( - [&queue] () - { - queue.consumer(); - })); + const auto consumer = std::unique_ptr<std::thread>( + new std::thread(&MessageQueue::consumer, &queue)); producer->join(); consumer->join(); |