diff options
Diffstat (limited to 'src/components/include/utils/message_queue.h')
| -rw-r--r-- | src/components/include/utils/message_queue.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/components/include/utils/message_queue.h b/src/components/include/utils/message_queue.h index 9d998cc69..e0b333672 100644 --- a/src/components/include/utils/message_queue.h +++ b/src/components/include/utils/message_queue.h @@ -28,10 +28,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. -*/ + */ -#ifndef MESSAGE_QUEUE_CLASS -#define MESSAGE_QUEUE_CLASS +#ifndef SRC_COMPONENTS_INCLUDE_UTILS_MESSAGE_QUEUE_H_ +#define SRC_COMPONENTS_INCLUDE_UTILS_MESSAGE_QUEUE_H_ #include <queue> @@ -44,7 +44,9 @@ * \class MessageQueue * \brief Wrapper for multithreading queue. */ - //TODO(Ezamakhov): move to utils namespace + +namespace utils { + template<typename T, class Q = std::queue<T> > class MessageQueue { public: typedef Q Queue; @@ -107,7 +109,6 @@ template<typename T, class Q = std::queue<T> > class MessageQueue { void Reset(); private: - /** *\brief Queue */ @@ -157,11 +158,12 @@ template<typename T, class Q> void MessageQueue<T, Q>::push(const T& element) { { sync_primitives::AutoLock auto_lock(queue_lock_); if (shutting_down_) { - CREATE_LOGGERPTR_LOCAL(logger_, "Utils") - LOG4CXX_ERROR(logger_, "Runtime error, pushing into queue" + CREATE_LOGGERPTR_LOCAL(logger_, "Utils") + LOG4CXX_ERROR(logger_, "Runtime error, pushing into queue" " that is being shut down"); + return; } - queue_.push(element); + queue_.push(element); } queue_new_items_.Broadcast(); } @@ -193,4 +195,6 @@ template<typename T, class Q> void MessageQueue<T, Q>::Reset() { } } -#endif // MESSAGE_QUEUE_CLASS +} // namespace utils + +#endif // SRC_COMPONENTS_INCLUDE_UTILS_MESSAGE_QUEUE_H_ |