From ffedc440b1b573baeef4010bd27ce592c508f0f1 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 22 Apr 2020 09:31:46 +0200
Subject: [PATCH] Use moodycamel queue from hpx::concurrency namespace

---
 src/apex/profiler_listener.hpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/apex/profiler_listener.hpp b/src/apex/profiler_listener.hpp
index 754ad2b7..9258a71d 100644
--- a/src/apex/profiler_listener.hpp
+++ b/src/apex/profiler_listener.hpp
@@ -40,8 +40,10 @@
 // HPX has its own version of moodycamel concurrent queue
 #ifdef APEX_HAVE_HPX_CONFIG
 #include "hpx/concurrency/concurrentqueue.hpp"
+using hpx::concurrency::ConcurrentQueue;
 #else
 #include "concurrentqueue/concurrentqueue.h"
+using moodycamel::ConcurrentQueue;
 #endif
 
 #include "apex_assert.h"
@@ -63,7 +65,7 @@
 
 namespace apex {
 
-class profiler_queue_t : public moodycamel::ConcurrentQueue<std::shared_ptr<profiler> > {
+class profiler_queue_t : public ConcurrentQueue<std::shared_ptr<profiler> > {
 public:
   profiler_queue_t() {}
   virtual ~profiler_queue_t() {
@@ -71,7 +73,7 @@ class profiler_queue_t : public moodycamel::ConcurrentQueue<std::shared_ptr<prof
   }
 };
 
-class dependency_queue_t : public moodycamel::ConcurrentQueue<task_dependency*> {
+class dependency_queue_t : public ConcurrentQueue<task_dependency*> {
 public:
   dependency_queue_t() {}
   virtual ~dependency_queue_t() {
@@ -123,7 +125,7 @@ class profiler_listener : public event_listener {
   std::vector<dependency_queue_t*> dependency_queues;
   dependency_queue_t * _construct_dependency_queue(void);
   dependency_queue_t * dependency_queue(void);
-  //moodycamel::ConcurrentQueue<task_dependency*> dependency_queue;
+  //ConcurrentQueue<task_dependency*> dependency_queue;
 #if defined(APEX_THROTTLE)
   std::unordered_set<task_identifier> throttled_tasks;
 #endif