Merge pull request #11955 from davidlt/fix-priv-macros-PerfTools-Call…

…grind PerfTools/Callgrind: remove intrusive macros breaking libstdc++
cms-sw · Oct 19, 2015 · 284dfdb · 284dfdb
2 parents 1790c03 + 3d0c41c
commit 284dfdb
Show file tree

Hide file tree

Showing 2 changed files with 386 additions and 379 deletions.
diff --git a/PerfTools/Callgrind/interface/ProfilerService.h b/PerfTools/Callgrind/interface/ProfilerService.h
@@ -10,13 +10,22 @@
 #include <vector>
 #include <string>
 
+// Unit test for ProfilerService
+namespace test {
+  class TestProfilerService;
+  struct CheckPaths;
+}
 
 /** \class  ProfilerService
  * A Service to start and stop calgrind profiling on demand...
  * act also as profiler watchdog 
  * (in the same service to avoid dependency between service)
  */
 class ProfilerService {
+  // For tests
+  friend class test::TestProfilerService;
+  friend struct test::CheckPaths;
+
 public:
 
   /// Standard Service Constructor