From 070d23de7890db6bcf147e7fc1f7f64a68421509 Mon Sep 17 00:00:00 2001 From: Benj Bouv Date: Wed, 30 Jan 2013 22:40:41 +0100 Subject: [PATCH] eo: eoTimerStat becomes serializable by default --- eo/src/utils/eoTimer.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/eo/src/utils/eoTimer.h b/eo/src/utils/eoTimer.h index 9f9371ddd..8a1fbb1a8 100644 --- a/eo/src/utils/eoTimer.h +++ b/eo/src/utils/eoTimer.h @@ -198,10 +198,7 @@ class eoTimer * * @ingroup Utilities */ -class eoTimerStat -# ifdef WITH_MPI - : public eoserial::Persistent -# endif +class eoTimerStat : public eoserial::Persistent { public: @@ -222,15 +219,12 @@ class eoTimerStat * * It can readily be serialized with boost when compiling with mpi. */ - struct Stat -# ifdef WITH_MPI - : public eoserial::Persistent -# endif + struct Stat : public eoserial::Persistent { std::vector utime; std::vector stime; std::vector wtime; -#ifdef WITH_MPI + void unpack( const eoserial::Object* obj ) { utime.clear(); @@ -254,10 +248,8 @@ class eoTimerStat obj->add("wtime", eoserial::makeArray< std::vector, eoserial::MakeAlgorithm >( wtime ) ); return obj; } -# endif }; -#ifdef WITH_MPI void unpack( const eoserial::Object* obj ) { _stats.clear(); @@ -280,7 +272,6 @@ class eoTimerStat } return obj; } -# endif /** * @brief Forces the measures to be retrieved.