diff --git a/BaseLib/CPUTime.h b/BaseLib/CPUTime.h index 9c7dc145959d0130610aa9514602251ba7066b3f..fa5bf4ddd30670fcc9680b85b7d48cf2c36ec7bc 100644 --- a/BaseLib/CPUTime.h +++ b/BaseLib/CPUTime.h @@ -17,17 +17,14 @@ #include <ctime> -#include "TimeMeasurementBase.h" - namespace BaseLib { class CPUTime { public: - virtual void start(); - virtual void stop(); - virtual double elapsed(); - ~CPUTime() {}; + void start(); + void stop(); + double elapsed(); private: clock_t _start; clock_t _stop; diff --git a/BaseLib/RunTime.h b/BaseLib/RunTime.h index 7b3afac6d1e0feda613e6bb03f2622b162826b7f..6fa180995c0f5667e965e136d620235249ceba2a 100644 --- a/BaseLib/RunTime.h +++ b/BaseLib/RunTime.h @@ -15,25 +15,20 @@ #ifndef RUNTIME_H #define RUNTIME_H -#include "TimeMeasurementBase.h" - #ifndef _MSC_VER #include <sys/time.h> #else #include <windows.h> #endif -#include "TimeMeasurementBase.h" - namespace BaseLib { -class RunTime : public TimeMeasurementBase +class RunTime { public: - virtual void start(); - virtual void stop(); - virtual double elapsed(); - ~RunTime() {}; + void start(); + void stop(); + double elapsed(); private: #ifndef _MSC_VER timeval _start; diff --git a/BaseLib/TimeMeasurementBase.h b/BaseLib/TimeMeasurementBase.h deleted file mode 100644 index c57259870079a24ae39ea035ed40cf57804eb7b0..0000000000000000000000000000000000000000 --- a/BaseLib/TimeMeasurementBase.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * \file - * \author Thomas Fischer - * \date no date - * \brief Definition of the TimeMeasurementBase class. - * - * \copyright - * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org) - * Distributed under a Modified BSD License. - * See accompanying file LICENSE.txt or - * http://www.opengeosys.org/project/license - * - */ - -#ifndef TIMEMEASUREMENT_H -#define TIMEMEASUREMENT_H - -namespace BaseLib { - -class TimeMeasurementBase -{ -public: - virtual void start () = 0; - virtual void stop () = 0; - virtual double elapsed () = 0; - virtual ~TimeMeasurementBase () {}; -}; - -} // end namespace BaseLib - -#endif