CRYPTOPP 5.6.3 RC6 checkin

1 files changed, 61 insertions, 61 deletions

diff --git a/hrtimer.h b/hrtimer.h
index d62ba49d..2d22ffa6 100644
--- a/hrtimer.h
+++ b/hrtimer.h
@@ -1,61 +1,61 @@
-#ifndef CRYPTOPP_HRTIMER_H
-#define CRYPTOPP_HRTIMER_H
-
-#include "config.h"
-#ifndef HIGHRES_TIMER_AVAILABLE
-#include <time.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#ifdef HIGHRES_TIMER_AVAILABLE
-	typedef word64 TimerWord;
-#else
-	typedef clock_t TimerWord;
-#endif
-
-//! _
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TimerBase
-{
-public:
-	enum Unit {SECONDS = 0, MILLISECONDS, MICROSECONDS, NANOSECONDS};
-	TimerBase(Unit unit, bool stuckAtZero)	: m_timerUnit(unit), m_stuckAtZero(stuckAtZero), m_started(false) {}
-
-	virtual TimerWord GetCurrentTimerValue() =0;	// GetCurrentTime is a macro in MSVC 6.0
-	virtual TimerWord TicksPerSecond() =0;	// this is not the resolution, just a conversion factor into seconds
-
-	void StartTimer();
-	double ElapsedTimeAsDouble();
-	unsigned long ElapsedTime();
-
-private:
-	double ConvertTo(TimerWord t, Unit unit);
-
-	Unit m_timerUnit;	// HPUX workaround: m_unit is a system macro on HPUX
-	bool m_stuckAtZero, m_started;
-	TimerWord m_start, m_last;
-};
-
-//! measure CPU time spent executing instructions of this thread (if supported by OS)
-/*! /note This only works correctly on Windows NT or later. On Unix it reports process time, and others wall clock time.
-*/
-class CRYPTOPP_DLL ThreadUserTimer : public TimerBase
-{
-public:
-	ThreadUserTimer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false)	: TimerBase(unit, stuckAtZero) {}
-	TimerWord GetCurrentTimerValue();
-	TimerWord TicksPerSecond();
-};
-
-//! high resolution timer
-class CRYPTOPP_DLL Timer : public TimerBase
-{
-public:
-	Timer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false)	: TimerBase(unit, stuckAtZero) {}
-	TimerWord GetCurrentTimerValue();
-	TimerWord TicksPerSecond();
-};
-
-NAMESPACE_END
-
-#endif
+#ifndef CRYPTOPP_HRTIMER_H

+#define CRYPTOPP_HRTIMER_H

+

+#include "config.h"

+#ifndef HIGHRES_TIMER_AVAILABLE

+#include <time.h>

+#endif

+

+NAMESPACE_BEGIN(CryptoPP)

+

+#ifdef HIGHRES_TIMER_AVAILABLE

+	typedef word64 TimerWord;

+#else

+	typedef clock_t TimerWord;

+#endif

+

+//! _

+class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TimerBase

+{

+public:

+	enum Unit {SECONDS = 0, MILLISECONDS, MICROSECONDS, NANOSECONDS};

+	TimerBase(Unit unit, bool stuckAtZero)	: m_timerUnit(unit), m_stuckAtZero(stuckAtZero), m_started(false) {}

+

+	virtual TimerWord GetCurrentTimerValue() =0;	// GetCurrentTime is a macro in MSVC 6.0

+	virtual TimerWord TicksPerSecond() =0;	// this is not the resolution, just a conversion factor into seconds

+

+	void StartTimer();

+	double ElapsedTimeAsDouble();

+	unsigned long ElapsedTime();

+

+private:

+	double ConvertTo(TimerWord t, Unit unit);

+

+	Unit m_timerUnit;	// HPUX workaround: m_unit is a system macro on HPUX

+	bool m_stuckAtZero, m_started;

+	TimerWord m_start, m_last;

+};

+

+//! measure CPU time spent executing instructions of this thread (if supported by OS)

+/*! /note This only works correctly on Windows NT or later. On Unix it reports process time, and others wall clock time.

+*/

+class ThreadUserTimer : public TimerBase

+{

+public:

+	ThreadUserTimer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false)	: TimerBase(unit, stuckAtZero) {}

+	TimerWord GetCurrentTimerValue();

+	TimerWord TicksPerSecond();

+};

+

+//! high resolution timer

+class CRYPTOPP_DLL Timer : public TimerBase

+{

+public:

+	Timer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false)	: TimerBase(unit, stuckAtZero) {}

+	TimerWord GetCurrentTimerValue();

+	TimerWord TicksPerSecond();

+};

+

+NAMESPACE_END

+

+#endif