From: kronbichler Date: Thu, 29 Sep 2011 10:14:02 +0000 (+0000) Subject: Make compile. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9f9d0681c1d694a7facf3c56960867b71cf287;p=dealii-svn.git Make compile. git-svn-id: https://svn.dealii.org/trunk@24462 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/base/timer.cc b/deal.II/source/base/timer.cc index d366f954dc..0ecb790c32 100644 --- a/deal.II/source/base/timer.cc +++ b/deal.II/source/base/timer.cc @@ -118,6 +118,7 @@ double Timer::stop () double time = wall_timer.tv_sec + 1.e-6 * wall_timer.tv_usec - start_wall_time; +#ifdef DEAL_II_COMPILER_USE_MPI if (sync_wall_time && Utilities::System::job_supports_mpi()) { this->mpi_data @@ -126,6 +127,7 @@ double Timer::stop () cumulative_wall_time += this->mpi_data.max; } else +#endif cumulative_wall_time += time; } return cumulative_time;