Merge branch 'cuda_support' of https://github.com/khuck/xpress-apex i…

…nto cuda_support
UO-OACISS · Jul 27, 2020 · 3b6f713 · 3b6f713
2 parents 57302bb + bb52538
commit 3b6f713
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/apex/profiler_listener.cpp b/src/apex/profiler_listener.cpp
@@ -1740,6 +1740,10 @@ if (rc != 0) cout << "PAPI error! " << name << ": " << PAPI_strerror(rc) << endl
 
   }
 
+  void profiler_listener::push_profiler_public(std::shared_ptr<profiler> &p) {
+    push_profiler(0, p);
+  }
+
 }
 
 #ifdef APEX_HAVE_HPX

diff --git a/src/apex/profiler_listener.hpp b/src/apex/profiler_listener.hpp
@@ -231,16 +231,11 @@ class profiler_listener : public event_listener {
   void process_profiles(void);
   static void process_profiles_wrapper(void);
   static void consumer_process_profiles_wrapper(void);
-  void public_process_profile(std::shared_ptr<profiler> &p) {
-    process_profile(p,0);
-  };
   bool concurrent_cleanup(int i);
 #if APEX_HAVE_PAPI
   std::vector<std::string>& get_metric_names(void) { return metric_names; };
 #endif
-  void push_profiler_public(std::shared_ptr<profiler> &p) {
-    push_profiler(0, p);
-  }
+  void push_profiler_public(std::shared_ptr<profiler> &p);
 };
 
 }