F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2008-07-09 18:36:10 +01:00
parent a6ccafbed7 5f9b651ba8
commit 1f1ffe7372
4 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/object.cc
View File

@@ -113,7 +113,7 @@ Object::DoGetObject (TypeId tid) const
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 @@ Object::AggregateObject (Ptr<Object> o)
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);

4
src/core/object.h
View File

@@ -379,7 +379,7 @@ template <typename T>
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 @@ template <typename T>
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;
}

17
src/node/tcp-socket.h
View File

@@ -51,23 +51,6 @@ public:
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;

16
src/node/udp-socket.h
View File

@@ -50,22 +50,6 @@ public:
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;