Move EventCollector and SingleEvent classes, making them private to the OLSR code.

src/routing/olsr/event-collector.h

@@ -22,8 +22,8 @@
 #define EVENT_COLLECTOR_H
 
 #include <list>
-#include "event-id.h"
-#include "simulator.h"
+#include "ns3/event-id.h"
+#include "ns3/simulator.h"
 
 namespace ns3 {
 

src/routing/olsr/olsr-agent-impl.h

@@ -39,8 +39,8 @@
 #include "ns3/packet.h"
 #include "ns3/node.h"
 #include "ns3/socket.h"
-#include "ns3/single-event.h"
-#include "ns3/event-collector.h"
+#include "single-event.h"
+#include "event-collector.h"
 
 
 namespace ns3 {

src/routing/olsr/single-event.h

@@ -22,8 +22,8 @@
 #define SINGLE_EVENT_H
 
 #include <list>
-#include "event-id.h"
-#include "simulator.h"
+#include "ns3/event-id.h"
+#include "ns3/simulator.h"
 
 namespace ns3 {
 

src/routing/olsr/wscript

@@ -17,3 +17,10 @@ def build(bld):
         'olsr-agent.h',
         'olsr.h',
         ]
+
+
+    ## globally useful classes, temporarily private...
+    module.source.extend([
+            'event-collector.cc',
+            'single-event.cc',
+            ])

src/simulator/wscript

@@ -52,8 +52,6 @@ def build(bld):
         'high-precision.cc',
         'time.cc',
         'event-id.cc',
-        'event-collector.cc',
-        'single-event.cc',
         'scheduler.cc',
         'scheduler-factory.cc',
         'scheduler-list.cc',
@@ -69,8 +67,6 @@ def build(bld):
         'high-precision.h',
         'nstime.h',
         'event-id.h',
-        'event-collector.h',
-        'single-event.h',
         'event-impl.h',
         'simulator.h',
         'scheduler.h',