From 0480ea2a51334170214f26bd82e233c827070f09 Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Wed, 5 Dec 2012 12:01:38 +0100
Subject: [PATCH] [profiler] disambiguate outputTimings call, change test
accordingly
---
dune/stuff/common/profiler.hh | 2 +-
dune/stuff/test/common_math.cc | 2 +-
dune/stuff/test/common_profiler.cc | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dune/stuff/common/profiler.hh b/dune/stuff/common/profiler.hh
index 075ffaa32..5debffed2 100644
--- a/dune/stuff/common/profiler.hh
+++ b/dune/stuff/common/profiler.hh
@@ -123,7 +123,7 @@ public:
void outputMap(const InfoContainerMap& run_infos_map, const double scale_factor = 1.0) const;
//! file-output the named sections only
- void outputTimings(const std::string filename = "timings") const;
+ void outputTimings(const std::string filename) const;
void outputTimings(std::ostream& out = std::cout) const;
void outputTimingsAll(std::ostream& out = std::cout) const;
/** call this with correct numRuns <b> before </b> starting any profiling
diff --git a/dune/stuff/test/common_math.cc b/dune/stuff/test/common_math.cc
index 1b1d5af9e..75de2edfe 100644
--- a/dune/stuff/test/common_math.cc
+++ b/dune/stuff/test/common_math.cc
@@ -107,7 +107,7 @@ TYPED_TEST(MinMaxAvgTest, All)
EXPECT_TRUE(Dune::FloatCmp::eq(mma.average(), TypeParam(0.0)));
mma(-4);
mmCheck<MinMaxAvg<TypeParam>, TypeParam>(mma);
- mmb = mma;
+ auto mmb = mma;
mmCheck<MinMaxAvg<TypeParam>, TypeParam>(mmb);
}
diff --git a/dune/stuff/test/common_profiler.cc b/dune/stuff/test/common_profiler.cc
index e439ebe67..8a8b4449a 100644
--- a/dune/stuff/test/common_profiler.cc
+++ b/dune/stuff/test/common_profiler.cc
@@ -55,7 +55,8 @@ TEST(ProfilerTest, OutputConstness)
Profiler::InfoContainerMap info_map;
prof.output(infos);
prof.outputAveraged(0, 0);
- prof.outputTimings();
+ prof.outputTimings("timings");
+ prof.outputTimings(DSC::dev_null);
prof.outputMap(info_map);
}
--
GitLab