solve some merge problems

examples/simple-p2p-olsr.cc

@@ -54,14 +54,14 @@
 #include "ns3/ascii-trace.h"
 #include "ns3/pcap-trace.h"
 #include "ns3/internet-node.h"
-#include "ns3/p2p-channel.h"
-#include "ns3/p2p-net-device.h"
+#include "ns3/point-to-point-channel.h"
+#include "ns3/point-to-point-net-device.h"
 #include "ns3/mac-address.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/socket.h"
 #include "ns3/ipv4-route.h"
-#include "ns3/p2p-topology.h"
+#include "ns3/point-to-point-topology.h"
 #include "ns3/onoff-application.h"
 #include "ns3/debug.h"
 

examples/wscript

@@ -13,5 +13,5 @@ def build(bld):
     obj = create_ns_prog('csma-cd-one-subnet', 'csma-cd-one-subnet.cc', deps=['csma-cd', 'internet-node'])
 
     obj = create_ns_prog('simple-p2p-olsr', 'simple-p2p-olsr.cc',
-                         deps=['p2p', 'internet-node', 'olsr'])
+                         deps=['point-to-point', 'internet-node', 'olsr'])
 

src/routing/olsr/olsr.cc

@@ -1062,7 +1062,7 @@ void
 Olsr::QueueMessage (Packet message, Time delay)
 {
   m_queuedMessages.push_back (message);
-  if (not m_queuedMessagesTimer.GetEvent ().IsRunning ())
+  if (not m_queuedMessagesTimer.IsRunning ())
     {
       m_queuedMessagesTimer = Simulator::Schedule (delay, &Olsr::SendQueuedMessages, this);
     }