reorganize ifdef'ery to avoid warnings
This commit is contained in:
parent
34f411fadd
commit
d837afaf95
@ -344,8 +344,9 @@ bool TimeStep::serialize(std::map<std::string,std::string>& data)
|
|||||||
doSerializeOps(ar,*this);
|
doSerializeOps(ar,*this);
|
||||||
data.insert(std::make_pair("TimeStep", str.str()));
|
data.insert(std::make_pair("TimeStep", str.str()));
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#else
|
||||||
return false;
|
return false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,10 +59,11 @@ static double WallTime ()
|
|||||||
{
|
{
|
||||||
#ifdef USE_OPENMP
|
#ifdef USE_OPENMP
|
||||||
return omp_get_wtime();
|
return omp_get_wtime();
|
||||||
#endif
|
#else
|
||||||
timeval tmpTime;
|
timeval tmpTime;
|
||||||
gettimeofday(&tmpTime,nullptr);
|
gettimeofday(&tmpTime,nullptr);
|
||||||
return tmpTime.tv_sec + tmpTime.tv_usec/1.0e6;
|
return tmpTime.tv_sec + tmpTime.tv_usec/1.0e6;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user