From 484cd4bb144b78222b00f57ac82a719d3c7825b2 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 27 Aug 2017 19:20:04 -0400 Subject: [PATCH] Remove 'enum' qualifications from function calls. This is not needed in C++ (it is in C) and in most places we do not provide it anyway. --- include/deal.II/base/timer.h | 28 ++++++++++++++-------------- source/base/timer.cc | 16 ++++++++-------- source/lac/trilinos_solver.cc | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h index 71c227d31f..b187ef9519 100644 --- a/include/deal.II/base/timer.h +++ b/include/deal.II/base/timer.h @@ -567,9 +567,9 @@ public: * @param output_type A variable indicating what kind of timing the output * should represent (CPU or wall time). */ - TimerOutput (std::ostream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type); + TimerOutput (std::ostream &stream, + const OutputFrequency output_frequency, + const OutputType output_type); /** * Constructor. @@ -581,9 +581,9 @@ public: * @param output_type A variable indicating what kind of timing the output * should represent (CPU or wall time). */ - TimerOutput (ConditionalOStream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type); + TimerOutput (ConditionalOStream &stream, + const OutputFrequency output_frequency, + const OutputType output_type); /** * Constructor that takes an MPI communicator as input. A timer constructed @@ -608,10 +608,10 @@ public: * MPI_Barrier call before starting and stopping the timer for * each section. */ - TimerOutput (MPI_Comm mpi_comm, - std::ostream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type); + TimerOutput (MPI_Comm mpi_comm, + std::ostream &stream, + const OutputFrequency output_frequency, + const OutputType output_type); /** * Constructor that takes an MPI communicator as input. A timer constructed @@ -636,10 +636,10 @@ public: * MPI_Barrier call before starting and stopping the timer for * each section.) */ - TimerOutput (MPI_Comm mpi_comm, - ConditionalOStream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type); + TimerOutput (MPI_Comm mpi_comm, + ConditionalOStream &stream, + const OutputFrequency output_frequency, + const OutputType output_type); /** * Destructor. Calls print_summary() in case the option for writing the diff --git a/source/base/timer.cc b/source/base/timer.cc index 090668cd7d..61e7a11e75 100644 --- a/source/base/timer.cc +++ b/source/base/timer.cc @@ -329,8 +329,8 @@ void Timer::reset () /* ---------------------------- TimerOutput -------------------------- */ TimerOutput::TimerOutput (std::ostream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type) + const OutputFrequency output_frequency, + const OutputType output_type) : output_frequency (output_frequency), output_type (output_type), @@ -342,8 +342,8 @@ TimerOutput::TimerOutput (std::ostream &stream, TimerOutput::TimerOutput (ConditionalOStream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type) + const OutputFrequency output_frequency, + const OutputType output_type) : output_frequency (output_frequency), output_type (output_type), @@ -356,8 +356,8 @@ TimerOutput::TimerOutput (ConditionalOStream &stream, TimerOutput::TimerOutput (MPI_Comm mpi_communicator, std::ostream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type) + const OutputFrequency output_frequency, + const OutputType output_type) : output_frequency (output_frequency), output_type (output_type), @@ -370,8 +370,8 @@ TimerOutput::TimerOutput (MPI_Comm mpi_communicator, TimerOutput::TimerOutput (MPI_Comm mpi_communicator, ConditionalOStream &stream, - const enum OutputFrequency output_frequency, - const enum OutputType output_type) + const OutputFrequency output_frequency, + const OutputType output_type) : output_frequency (output_frequency), output_type (output_type), diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index 15b11271d1..82b2defe92 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -57,9 +57,9 @@ namespace TrilinosWrappers - SolverBase::SolverBase (const enum SolverBase::SolverName solver_name, - SolverControl &cn, - const AdditionalData &data) + SolverBase::SolverBase (const SolverBase::SolverName solver_name, + SolverControl &cn, + const AdditionalData &data) : solver_name (solver_name), solver_control (cn), -- 2.39.5