--- a/src/simulator/simulator.cc	Fri May 30 11:03:18 2008 -0700
+++ b/src/simulator/simulator.cc	Fri May 30 11:11:00 2008 -0700
@@ -115,8 +115,8 @@
     .AddAttribute ("Scheduler",
                    "The Scheduler used to handle all simulation events.",
                    PointerValue (),
-                   // XXX: allow getting the scheduler too.
-                   MakePointerAccessor (&SimulatorPrivate::SetScheduler),
+                   MakePointerAccessor (&SimulatorPrivate::SetScheduler,
+                                        &SimulatorPrivate::GetScheduler),
                    MakePointerChecker<Scheduler> ())
     ;
   return tid;

--- a/src/simulator/simulator.h	Fri May 30 11:03:18 2008 -0700
+++ b/src/simulator/simulator.h	Fri May 30 11:11:00 2008 -0700
@@ -61,7 +61,11 @@
    */
   static void EnableParallelSimulation (void);
   /**
-   * XXX
+   * \param scheduler a new event scheduler
+   *
+   * The event scheduler can be set at any time: the events scheduled
+   * in the previous scheduler will be transfered to the new scheduler
+   * before we start to use it.
    */
   static void SetScheduler (Ptr<Scheduler> scheduler);
 

--- a/src/simulator/time.cc	Fri May 30 11:03:18 2008 -0700
+++ b/src/simulator/time.cc	Fri May 30 11:11:00 2008 -0700
@@ -271,7 +271,6 @@
   else
     {
       is.setstate (std::ios_base::failbit);
-      // XXX: problem ?
     }
   return is;
 }