--- a/src/simulator/simulator.cc Tue Apr 15 09:41:58 2008 -0700
+++ b/src/simulator/simulator.cc Tue Apr 15 10:09:42 2008 -0700
@@ -393,9 +393,7 @@
}; // namespace ns3
-#include "scheduler-list.h"
-#include "scheduler-heap.h"
-#include "scheduler-map.h"
+#include "map-scheduler.h"
namespace ns3 {
@@ -418,7 +416,7 @@
if (m_priv == 0)
{
m_priv = CreateObject<SimulatorPrivate> ();
- Ptr<Scheduler> scheduler = CreateObject<SchedulerMap> ();
+ Ptr<Scheduler> scheduler = CreateObject<MapScheduler> ();
m_priv->SetScheduler (scheduler);
}
TRACE_S ("priv " << m_priv);
@@ -564,6 +562,8 @@
#include "ns3/test.h"
#include "ns3/ptr.h"
+#include "list-scheduler.h"
+#include "heap-scheduler.h"
namespace ns3 {
@@ -934,19 +934,19 @@
bool result = true;
Simulator::Destroy ();
- Simulator::SetScheduler (CreateObject<SchedulerList> ());
+ Simulator::SetScheduler (CreateObject<ListScheduler> ());
if (!RunOneTest ())
{
result = false;
}
Simulator::Destroy ();
- Simulator::SetScheduler (CreateObject<SchedulerHeap> ());
+ Simulator::SetScheduler (CreateObject<HeapScheduler> ());
if (!RunOneTest ())
{
result = false;
}
Simulator::Destroy ();
- Simulator::SetScheduler (CreateObject<SchedulerMap> ());
+ Simulator::SetScheduler (CreateObject<MapScheduler> ());
if (!RunOneTest ())
{
result = false;