Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-09-06 13:10:43 +0200
committerMartin Hořeňovský2020-09-06 13:11:42 +0200
commitcc18bd719da38e5415909f5b10199395f00076e6 (patch)
tree973427bffc72f3b2fbed258a1c2629c906f951f3 /src
parent90aeffb97d6942d16f75a56b11e10fc0b010995a (diff)
downloadcatch3-cc18bd719da38e5415909f5b10199395f00076e6.tar.gz
Sweep out Wshadow
Most of the changes are completely pointless renaming of constructor arguments so that they do not use the same name as the type members, but :shrug: Closes #2015
Diffstat (limited to 'src')
-rw-r--r--src/catch2/benchmark/catch_benchmark.hpp8
-rw-r--r--src/catch2/benchmark/catch_chronometer.hpp10
-rw-r--r--src/catch2/benchmark/detail/catch_benchmark_function.hpp4
-rw-r--r--src/catch2/internal/catch_clara.cpp4
-rw-r--r--src/catch2/reporters/catch_reporter_helpers.hpp2
5 files changed, 14 insertions, 14 deletions
diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp
index 641a2209..8ff69b4a 100644
--- a/src/catch2/benchmark/catch_benchmark.hpp
+++ b/src/catch2/benchmark/catch_benchmark.hpp
@@ -33,12 +33,12 @@
namespace Catch {
namespace Benchmark {
struct Benchmark {
- Benchmark(std::string &&name)
- : name(std::move(name)) {}
+ Benchmark(std::string&& benchmarkName)
+ : name(std::move(benchmarkName)) {}
template <class FUN>
- Benchmark(std::string &&name, FUN &&func)
- : fun(std::move(func)), name(std::move(name)) {}
+ Benchmark(std::string&& benchmarkName , FUN &&func)
+ : fun(std::move(func)), name(std::move(benchmarkName)) {}
template <typename Clock>
ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
diff --git a/src/catch2/benchmark/catch_chronometer.hpp b/src/catch2/benchmark/catch_chronometer.hpp
index ae172aa6..10fd5a27 100644
--- a/src/catch2/benchmark/catch_chronometer.hpp
+++ b/src/catch2/benchmark/catch_chronometer.hpp
@@ -44,11 +44,11 @@ namespace Catch {
template <typename Fun>
void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
- int runs() const { return k; }
+ int runs() const { return repeats; }
- Chronometer(Detail::ChronometerConcept& meter, int k)
+ Chronometer(Detail::ChronometerConcept& meter, int repeats_)
: impl(&meter)
- , k(k) {}
+ , repeats(repeats_) {}
private:
template <typename Fun>
@@ -60,13 +60,13 @@ namespace Catch {
void measure(Fun&& fun, std::true_type) {
Detail::optimizer_barrier();
impl->start();
- for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+ for (int i = 0; i < repeats; ++i) invoke_deoptimized(fun, i);
impl->finish();
Detail::optimizer_barrier();
}
Detail::ChronometerConcept* impl;
- int k;
+ int repeats;
};
} // namespace Benchmark
} // namespace Catch
diff --git a/src/catch2/benchmark/detail/catch_benchmark_function.hpp b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
index fdac9aff..4e0c55ff 100644
--- a/src/catch2/benchmark/detail/catch_benchmark_function.hpp
+++ b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
@@ -48,8 +48,8 @@ namespace Catch {
};
template <typename Fun>
struct model : public callable {
- model(Fun&& fun) : fun(std::move(fun)) {}
- model(Fun const& fun) : fun(fun) {}
+ model(Fun&& fun_) : fun(std::move(fun_)) {}
+ model(Fun const& fun_) : fun(fun_) {}
model<Fun>* clone() const override { return new model<Fun>(*this); }
diff --git a/src/catch2/internal/catch_clara.cpp b/src/catch2/internal/catch_clara.cpp
index 7c4613ed..eb7dacae 100644
--- a/src/catch2/internal/catch_clara.cpp
+++ b/src/catch2/internal/catch_clara.cpp
@@ -78,8 +78,8 @@ namespace Catch {
TokenStream::TokenStream( Args const& args ):
TokenStream( args.m_args.begin(), args.m_args.end() ) {}
- TokenStream::TokenStream( Iterator it, Iterator itEnd ):
- it( it ), itEnd( itEnd ) {
+ TokenStream::TokenStream( Iterator it_, Iterator itEnd_ ):
+ it( it_ ), itEnd( itEnd_ ) {
loadBuffer();
}
diff --git a/src/catch2/reporters/catch_reporter_helpers.hpp b/src/catch2/reporters/catch_reporter_helpers.hpp
index 0f8dd92b..c86863ba 100644
--- a/src/catch2/reporters/catch_reporter_helpers.hpp
+++ b/src/catch2/reporters/catch_reporter_helpers.hpp
@@ -26,7 +26,7 @@ namespace Catch {
struct lineOfChars {
char c;
- constexpr lineOfChars( char c ): c( c ) {}
+ constexpr lineOfChars( char c_ ): c( c_ ) {}
friend std::ostream& operator<<( std::ostream& out, lineOfChars value );
};