]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove 'enum' qualifications from function calls. 4973/head
authorDavid Wells <wellsd2@rpi.edu>
Sun, 27 Aug 2017 23:20:04 +0000 (19:20 -0400)
committerDavid Wells <wellsd2@rpi.edu>
Sun, 27 Aug 2017 23:20:04 +0000 (19:20 -0400)
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
source/base/timer.cc
source/lac/trilinos_solver.cc

index 71c227d31fab3a94b664bf84baae4e7b05dc83dc..b187ef95191c0eba54666ae1304b46890136af3a 100644 (file)
@@ -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:
    * <code>MPI_Barrier</code> 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:
    * <code>MPI_Barrier</code> 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
index 090668cd7db7864f267e5b66c0312809952e3fbd..61e7a11e75bd2be08d1a02b9ddf23e3140fd0215 100644 (file)
@@ -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),
index 15b11271d1e012e2471ed27e8c77a5b10eab7764..82b2defe92dd94f63b27d699a1f04fb84f62368c 100644 (file)
@@ -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),

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.