diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 21:45:12 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | f7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch) | |
| tree | e09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gnuradio-runtime/lib/sptr_magic.cc | |
| parent | 78431dc6941e3acc67c858277dfe4a0ed583643c (diff) | |
Tree: clang-format without the include sorting
Diffstat (limited to 'gnuradio-runtime/lib/sptr_magic.cc')
| -rw-r--r-- | gnuradio-runtime/lib/sptr_magic.cc | 68 |
1 files changed, 29 insertions, 39 deletions
diff --git a/gnuradio-runtime/lib/sptr_magic.cc b/gnuradio-runtime/lib/sptr_magic.cc index bffef04756..03693cdc8f 100644 --- a/gnuradio-runtime/lib/sptr_magic.cc +++ b/gnuradio-runtime/lib/sptr_magic.cc @@ -32,61 +32,51 @@ namespace gnuradio { - static gr::thread::mutex s_mutex; - typedef std::map<gr::basic_block*, gr::basic_block_sptr> sptr_map; - static sptr_map s_map; +static gr::thread::mutex s_mutex; +typedef std::map<gr::basic_block*, gr::basic_block_sptr> sptr_map; +static sptr_map s_map; - struct disarmable_deleter - { +struct disarmable_deleter { bool armed; - disarmable_deleter() - { - armed = true; - } + disarmable_deleter() { armed = true; } - void operator()(void *p) const + void operator()(void* p) const { - if (armed) - delete static_cast<gr::basic_block *>(p); + if (armed) + delete static_cast<gr::basic_block*>(p); } - void disarm() - { - armed = false; - } - }; + void disarm() { armed = false; } +}; - void - detail::sptr_magic::create_and_stash_initial_sptr(gr::hier_block2 *p) - { +void detail::sptr_magic::create_and_stash_initial_sptr(gr::hier_block2* p) +{ gr::basic_block_sptr sptr(p, disarmable_deleter()); gr::thread::scoped_lock guard(s_mutex); - s_map.insert(sptr_map::value_type(static_cast<gr::basic_block *>(p), sptr)); - } + s_map.insert(sptr_map::value_type(static_cast<gr::basic_block*>(p), sptr)); +} - void - detail::sptr_magic::cancel_initial_sptr(gr::hier_block2 *p) - { +void detail::sptr_magic::cancel_initial_sptr(gr::hier_block2* p) +{ gr::thread::scoped_lock guard(s_mutex); - sptr_map::iterator pos = s_map.find(static_cast<gr::basic_block *>(p)); - if(pos == s_map.end()) - return; /* Not in the map, nothing to do */ + sptr_map::iterator pos = s_map.find(static_cast<gr::basic_block*>(p)); + if (pos == s_map.end()) + return; /* Not in the map, nothing to do */ gr::basic_block_sptr sptr = pos->second; s_map.erase(pos); boost::get_deleter<disarmable_deleter, gr::basic_block>(sptr)->disarm(); - } +} - gr::basic_block_sptr - detail::sptr_magic::fetch_initial_sptr(gr::basic_block *p) - { +gr::basic_block_sptr detail::sptr_magic::fetch_initial_sptr(gr::basic_block* p) +{ /* * If p isn't a subclass of gr::hier_block2, just create the * shared ptr and return it. */ - gr::hier_block2 *hb2 = dynamic_cast<gr::hier_block2 *>(p); - if(!hb2) { - return gr::basic_block_sptr(p); + gr::hier_block2* hb2 = dynamic_cast<gr::hier_block2*>(p); + if (!hb2) { + return gr::basic_block_sptr(p); } /* @@ -94,12 +84,12 @@ namespace gnuradio { * and stashed it away. Fish it out and return it. */ gr::thread::scoped_lock guard(s_mutex); - sptr_map::iterator pos = s_map.find(static_cast<gr::basic_block *>(p)); - if(pos == s_map.end()) - throw std::invalid_argument("sptr_magic: invalid pointer!"); + sptr_map::iterator pos = s_map.find(static_cast<gr::basic_block*>(p)); + if (pos == s_map.end()) + throw std::invalid_argument("sptr_magic: invalid pointer!"); gr::basic_block_sptr sptr = pos->second; s_map.erase(pos); return sptr; - } } +} // namespace gnuradio |