Binary file src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap has changed

Binary file src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap has changed

Binary file src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap has changed

Binary file src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap has changed

Binary file src/devices/mesh/flame/test/flame-regression-test-0-1.pcap has changed

Binary file src/devices/mesh/flame/test/flame-regression-test-2-1.pcap has changed

Binary file src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap has changed

Binary file src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap has changed

Binary file src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap has changed

Binary file src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap has changed

Binary file src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap has changed

Binary file src/routing/aodv/test/bug-606-test-0-0.pcap has changed

Binary file src/routing/aodv/test/bug-606-test-1-0.pcap has changed

Binary file src/routing/aodv/test/bug-606-test-2-0.pcap has changed

Binary file src/routing/aodv/test/tcp-chain-test-0-0.pcap has changed

Binary file src/routing/aodv/test/tcp-chain-test-9-0.pcap has changed

Binary file src/routing/aodv/test/udp-chain-test-0-0.pcap has changed

Binary file src/routing/aodv/test/udp-chain-test-9-0.pcap has changed

Binary file src/routing/olsr/test/bug780-0-0.pcap has changed

Binary file src/routing/olsr/test/bug780-1-0.pcap has changed

--- a/src/simulator/time.cc	Mon Jul 05 16:38:11 2010 +0200
+++ b/src/simulator/time.cc	Tue Jul 06 17:15:00 2010 +0200
@@ -120,17 +120,14 @@
   iss.str (s);
   double v;
   iss >> v;
-  m_data = HighPrecision (v);
-  m_data.Mul (HighPrecision (TimeStepPrecision::g_tsPrecFactor, false));
+  m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);
 }
 
 double
 TimeUnit<1>::GetSeconds (void) const
 {
-  HighPrecision tmp = GetHighPrecision ();
-  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
-  tmp.Div (factor);
-  return tmp.GetDouble ();
+  double timeValue = GetHighPrecision ().GetDouble ();
+  return timeValue / TimeStepPrecision::g_tsPrecFactor;
 }
 
 int64_t
@@ -288,10 +285,9 @@
 
 Time Seconds (double seconds)
 {
-  HighPrecision tmp = HighPrecision (seconds);
-  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
-  tmp.Mul (factor);
-  return Time (tmp);
+  double d_sec = seconds * TimeStepPrecision::g_tsPrecFactor;
+  return Time (HighPrecision (d_sec));
+  //  return Time (HighPrecision ((int64_t)d_sec, false));
 }
 
 uint64_t