diff options
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/pbd/pool.h | 18 | ||||
| -rw-r--r-- | libs/pbd/pbd/ringbuffer.h | 3 |
2 files changed, 12 insertions, 9 deletions
diff --git a/libs/pbd/pbd/pool.h b/libs/pbd/pbd/pool.h index edc247332e..1afa8d7af9 100644 --- a/libs/pbd/pbd/pool.h +++ b/libs/pbd/pbd/pool.h @@ -46,7 +46,7 @@ class LIBPBD_API Pool guint total() const { return free_list.bufsize(); } protected: - RingBuffer<void*> free_list; ///< a list of pointers to free items within block + PBD::RingBuffer<void*> free_list; ///< a list of pointers to free items within block std::string _name; private: @@ -116,7 +116,7 @@ class LIBPBD_API CrossThreadPool : public Pool void flush_pending_with_ev (void*); private: - RingBuffer<void*> pending; + PBD::RingBuffer<void*> pending; PerThreadPool* _parent; }; @@ -125,24 +125,24 @@ class LIBPBD_API CrossThreadPool : public Pool */ class LIBPBD_API PerThreadPool { - public: +public: PerThreadPool (); - const Glib::Threads::Private<CrossThreadPool>& key() const { return _key; } + const Glib::Threads::Private<CrossThreadPool>& key() const { return _key; } void create_per_thread_pool (std::string name, unsigned long item_size, unsigned long nitems); CrossThreadPool* per_thread_pool (bool must_exist = true); bool has_per_thread_pool (); - void set_trash (RingBuffer<CrossThreadPool*>* t); + void set_trash (PBD::RingBuffer<CrossThreadPool*>* t); void add_to_trash (CrossThreadPool *); - private: - Glib::Threads::Private<CrossThreadPool> _key; +private: + Glib::Threads::Private<CrossThreadPool> _key; std::string _name; /** mutex to protect either changes to the _trash variable, or writes to the RingBuffer */ - Glib::Threads::Mutex _trash_mutex; - RingBuffer<CrossThreadPool*>* _trash; + Glib::Threads::Mutex _trash_mutex; + PBD::RingBuffer<CrossThreadPool*>* _trash; }; #endif // __qm_pool_h__ diff --git a/libs/pbd/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h index 58c463ecbe..9b5b09651e 100644 --- a/libs/pbd/pbd/ringbuffer.h +++ b/libs/pbd/pbd/ringbuffer.h @@ -25,6 +25,8 @@ #include "pbd/libpbd_visibility.h" +namespace PBD { + template<class T> class /*LIBPBD_API*/ RingBuffer { @@ -279,5 +281,6 @@ RingBuffer<T>::get_write_vector (typename RingBuffer<T>::rw_vector *vec) } } +} /* end namespace */ #endif /* __ringbuffer_h__ */ |