From 026f3f2aefa5ea2034eef85a34c3ba3bbed5cc47 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 29 Nov 2007 15:59:31 +0100 Subject: [PATCH] MaxSeconds -> Simulator::GetMaximumSimulationTime --- src/devices/wifi/dcf-manager.cc | 2 +- src/simulator/nstime.h | 6 ------ src/simulator/time.cc | 7 ------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/devices/wifi/dcf-manager.cc b/src/devices/wifi/dcf-manager.cc index f1f12b11c..a49e3a41f 100644 --- a/src/devices/wifi/dcf-manager.cc +++ b/src/devices/wifi/dcf-manager.cc @@ -372,7 +372,7 @@ DcfManager::DoRestartAccessTimeoutIfNeeded (void) * if there is one, how many slots for AIFS+backoff does it require ? */ bool accessTimeoutNeeded = false; - Time expectedBackoffEnd = MaxSeconds (); + Time expectedBackoffEnd = Simulator::GetMaximumSimulationTime (); for (States::const_iterator i = m_states.begin (); i != m_states.end (); i++) { DcfState *state = *i; diff --git a/src/simulator/nstime.h b/src/simulator/nstime.h index 24d7fd671..6b6660f70 100644 --- a/src/simulator/nstime.h +++ b/src/simulator/nstime.h @@ -577,12 +577,6 @@ Time PicoSeconds (uint64_t ps); */ Time FemtoSeconds (uint64_t fs); -/** - * \brief create a ns3::Time instance which represents - * the maximum value representable in a simulation. - */ -Time MaxSeconds (void); - // internal function not publicly documented Time TimeStep (uint64_t ts); diff --git a/src/simulator/time.cc b/src/simulator/time.cc index 565828ce9..fc5507906 100644 --- a/src/simulator/time.cc +++ b/src/simulator/time.cc @@ -268,13 +268,6 @@ Time FemtoSeconds (uint64_t fs) uint64_t ts = TimeUnit<1>::UnitsToTimestep(fs, TimeStepPrecision::FS_FACTOR); return TimeStep(ts); } -Time MaxSeconds (void) -{ - // XXX: I am fairly certain other compilers use other non-standard - // post-fixes to indicate 64 bit constants. - return TimeStep (0x7fffffffffffffffLL); -} - /* * The timestep value passed to this function must be of the precision * of TimeStepPrecision::Get