Resolve memory leak from benchmark instances in google/benchmark#17.

This shifts registration from a global vector to a singleton that manages
benchmark destruction during shutdown.

1 files changed, 3 insertions, 5 deletions

diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h
index 977e646..e7ec531 100644
--- a/include/benchmark/benchmark.h
+++ b/include/benchmark/benchmark.h
@@ -178,6 +178,7 @@ void UseRealTime();
 
 namespace internal {
 class Benchmark;
+class BenchmarkFamilies;
 }
 
 // State is passed to a running Benchmark and contains state for the
@@ -444,15 +445,12 @@ class Benchmark {
   // Used inside the benchmark implementation
   struct Instance;
 
-  // Extract the list of benchmark instances that match the specified
-  // regular expression.
-  static void FindBenchmarks(const std::string& re,
-                             std::vector<Instance>* benchmarks);
-
   // Measure the overhead of an empty benchmark to subtract later.
   static void MeasureOverhead();
 
  private:
+  friend class BenchmarkFamilies;
+
   std::vector<Benchmark::Instance> CreateBenchmarkInstances(int rangeXindex,
                                                             int rangeYindex);