# HG changeset patch
# User Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
# Date 1215624970 -3600
# Node ID 1d46345ab5d700a636bf049a6005f28d45de3874
# Parent  518719e905a0db6ef806fbcc15cd3ca425c3ef27# Parent  266c6a3347628f08b980dd07bfd1847732845a7c
merge

diff -r 518719e905a0 -r 1d46345ab5d7 src/core/object.cc
--- a/src/core/object.cc	Wed Jul 09 18:33:16 2008 +0100
+++ b/src/core/object.cc	Wed Jul 09 18:36:10 2008 +0100
@@ -113,7 +113,7 @@
   const Object *currentObject = this;
   do {
     NS_ASSERT (currentObject != 0);
-    TypeId cur = currentObject->m_tid;
+    TypeId cur = currentObject->GetInstanceTypeId ();
     while (cur != tid && cur != Object::GetTypeId ())
       {
         cur = cur.GetParent ();
@@ -146,10 +146,11 @@
   NS_ASSERT (CheckLoose ());
   NS_ASSERT (o->CheckLoose ());
 
-  if (DoGetObject (o->m_tid))
+  if (DoGetObject (o->GetInstanceTypeId ()))
     {
       NS_FATAL_ERROR ("Object::AggregateObject(): "
-       "Multiple aggregation of objects of type " << o->m_tid.GetName ());
+                      "Multiple aggregation of objects of type " << 
+                      o->GetInstanceTypeId ().GetName ());
     }
 
   Object *other = PeekPointer (o);
diff -r 518719e905a0 -r 1d46345ab5d7 src/core/object.h
--- a/src/core/object.h	Wed Jul 09 18:33:16 2008 +0100
+++ b/src/core/object.h	Wed Jul 09 18:36:10 2008 +0100
@@ -379,7 +379,7 @@
 Ptr<T> CopyObject (Ptr<T> object)
 {
   Ptr<T> p = Ptr<T> (new T (*PeekPointer (object)), false);
-  NS_ASSERT (p->m_tid == object->m_tid);
+  NS_ASSERT (p->GetInstanceTypeId () == object->GetInstanceTypeId ());
   return p;
 }
 
@@ -387,7 +387,7 @@
 Ptr<T> CopyObject (Ptr<const T> object)
 {
   Ptr<T> p = Ptr<T> (new T (*PeekPointer (object)), false);
-  NS_ASSERT (p->m_tid == object->m_tid);
+  NS_ASSERT (p->GetInstanceTypeId () == object->GetInstanceTypeId ());
   return p;
 }
 
diff -r 518719e905a0 -r 1d46345ab5d7 src/node/tcp-socket.h
--- a/src/node/tcp-socket.h	Wed Jul 09 18:33:16 2008 +0100
+++ b/src/node/tcp-socket.h	Wed Jul 09 18:36:10 2008 +0100
@@ -51,23 +51,6 @@
   TcpSocket (void);
   virtual ~TcpSocket (void);
 
-  virtual enum Socket::SocketErrno GetErrno (void) const = 0;
-  virtual Ptr<Node> GetNode (void) const = 0;
-  virtual int Bind () = 0;
-  virtual int Close (void) = 0;
-  virtual int ShutdownSend (void) = 0;
-  virtual int ShutdownRecv (void) = 0;
-  virtual int Connect (const Address &address) = 0;
-  virtual uint32_t GetTxAvailable (void) const = 0;
-  virtual int Send (Ptr<Packet> p, uint32_t flags) = 0;
-  virtual int SendTo (Ptr<Packet> p, uint32_t flags, 
-    const Address &toAddress) = 0;
-  virtual uint32_t GetRxAvailable (void) const = 0;
-  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags) = 0;
-  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,
-    Address &fromAddress) = 0;
-
-
 private:
   // Indirect the attribute setting and getting through private virtual methods
   virtual void SetSndBufSize (uint32_t size) = 0;
diff -r 518719e905a0 -r 1d46345ab5d7 src/node/udp-socket.h
--- a/src/node/udp-socket.h	Wed Jul 09 18:33:16 2008 +0100
+++ b/src/node/udp-socket.h	Wed Jul 09 18:36:10 2008 +0100
@@ -50,22 +50,6 @@
   UdpSocket (void);
   virtual ~UdpSocket (void);
 
-  virtual enum Socket::SocketErrno GetErrno (void) const = 0;
-  virtual Ptr<Node> GetNode (void) const = 0;
-  virtual int Bind () = 0;
-  virtual int Close (void) = 0;
-  virtual int ShutdownSend (void) = 0;
-  virtual int ShutdownRecv (void) = 0;
-  virtual int Connect (const Address &address) = 0;
-  virtual uint32_t GetTxAvailable (void) const = 0;
-  virtual int Send (Ptr<Packet> p, uint32_t flags) = 0;
-  virtual int SendTo (Ptr<Packet> p, uint32_t flags,
-    const Address &toAddress) = 0;
-  virtual uint32_t GetRxAvailable (void) const = 0;
-  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags) = 0;
-  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,
-    Address &fromAddress) = 0;
-
 private:
   // Indirect the attribute setting and getting through private virtual methods
   virtual void SetRcvBufSize (uint32_t size) = 0;