From d5152bdccb28ae6286cac29b57199f7e58159608 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 7 Apr 2008 00:48:39 +0000
Subject: Move combine_timers from a free-standing function in util.h to a
 private static function of the Timer base class - since that is the only code
 which actually needs to access it.

---
 src/timers.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/timers.cpp')

diff --git a/src/timers.cpp b/src/timers.cpp
index ea2ec9dfa..da02e46c6 100644
--- a/src/timers.cpp
+++ b/src/timers.cpp
@@ -5,7 +5,6 @@
 
 #include <botan/timers.h>
 #include <botan/libstate.h>
-#include <botan/util.h>
 #include <ctime>
 
 namespace Botan {
@@ -34,7 +33,7 @@ u64bit Timer::clock() const
 /*************************************************
 * Combine a two time values into a single one    *
 *************************************************/
-u64bit combine_timers(u32bit seconds, u32bit parts, u32bit parts_hz)
+u64bit Timer::combine_timers(u32bit seconds, u32bit parts, u32bit parts_hz)
    {
    const u64bit NANOSECONDS_UNITS = 1000000000;
    parts *= (NANOSECONDS_UNITS / parts_hz);
-- 
cgit v1.2.3