From d837afaf955529d16077756433f5081232b221ae Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 10 May 2017 08:52:37 +0200 Subject: [PATCH] reorganize ifdef'ery to avoid warnings --- src/SIM/TimeStep.C | 3 ++- src/Utility/Profiler.C | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SIM/TimeStep.C b/src/SIM/TimeStep.C index 75dfc7dc..1aae1096 100644 --- a/src/SIM/TimeStep.C +++ b/src/SIM/TimeStep.C @@ -344,8 +344,9 @@ bool TimeStep::serialize(std::map& data) doSerializeOps(ar,*this); data.insert(std::make_pair("TimeStep", str.str())); return true; -#endif +#else return false; +#endif } diff --git a/src/Utility/Profiler.C b/src/Utility/Profiler.C index fbcfacb3..17933715 100644 --- a/src/Utility/Profiler.C +++ b/src/Utility/Profiler.C @@ -59,10 +59,11 @@ static double WallTime () { #ifdef USE_OPENMP return omp_get_wtime(); -#endif +#else timeval tmpTime; gettimeofday(&tmpTime,nullptr); return tmpTime.tv_sec + tmpTime.tv_usec/1.0e6; +#endif }