diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gnuradio-runtime/lib/thread | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gnuradio-runtime/lib/thread')
| -rw-r--r-- | gnuradio-runtime/lib/thread/thread_group.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/thread/thread_group.cc b/gnuradio-runtime/lib/thread/thread_group.cc index e467dfda5a..637525e19e 100644 --- a/gnuradio-runtime/lib/thread/thread_group.cc +++ b/gnuradio-runtime/lib/thread/thread_group.cc @@ -37,7 +37,7 @@ namespace gr { { // No scoped_lock required here since the only "shared data" that's // modified here occurs inside add_thread which does scoped_lock. - std::auto_ptr<boost::thread> thrd(new boost::thread(threadfunc)); + std::unique_ptr<boost::thread> thrd(new boost::thread(threadfunc)); add_thread(thrd.get()); return thrd.release(); } |