--- a/src/simulator/simulator.cc	Mon Sep 04 13:11:34 2006 +0200
+++ b/src/simulator/simulator.cc	Mon Sep 04 13:14:39 2006 +0200
@@ -387,13 +387,13 @@
 void
 SimulatorTests::b (int b)
 {
-	if (b != 2) {
+	if (b != 2 || Simulator::now ().us () != 11) {
 		m_b = false;
 	} else {
 		m_b = true;
 	}
 	Simulator::remove (m_id_c);
-	Simulator::schedule (RelTimeUs (10), &SimulatorTests::d, this, 4);
+	Simulator::schedule (Time::rel_us (10), &SimulatorTests::d, this, 4);
 }
 void
 SimulatorTests::c (int c)
@@ -403,7 +403,7 @@
 void
 SimulatorTests::d (int d)
 {
-	if (d != 4) {
+	if (d != 4 || Simulator::now ().us () != (11+10)) {
 		m_d = false;
 	} else {
 		m_d = true;
@@ -417,9 +417,9 @@
 	m_b = false;
 	m_c = true;
 	m_d = false;
-	EventId a = Simulator::schedule (AbsTimeUs (10), &SimulatorTests::a, this, 1);
-	EventId b = Simulator::schedule (AbsTimeUs (11), &SimulatorTests::b, this, 2);
-	m_id_c = Simulator::schedule (AbsTimeUs (12), &SimulatorTests::c, this, 3);
+	EventId a = Simulator::schedule (Time::abs_us (10), &SimulatorTests::a, this, 1);
+	EventId b = Simulator::schedule (Time::abs_us (11), &SimulatorTests::b, this, 2);
+	m_id_c = Simulator::schedule (Time::abs_us (12), &SimulatorTests::c, this, 3);
 
 	Simulator::cancel (a);
 	Simulator::run ();
@@ -438,3 +438,4 @@
 #endif /* RUN_SELF_TESTS */
 
 
+