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

merge with HEAD

Browse Source
This commit is contained in:
Mathieu Lacage
2008-02-28 18:15:07 +01:00
parent de39c3b77a 8f6d84e669
commit 289cf2170e
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/attribute.h
View File

@@ -289,9 +289,6 @@ MakePtrAccessor (Ptr<U> T::*memberVariable)
struct MemberVariable : public internal::PtrAccessor<T,U>
{
Ptr<U> T::*m_memberVariable;
virtual MemberVariable *Copy (void) const {
return new MemberVariable (*this);
}
virtual void DoSet (T *object, Ptr<U> value) const {
(object->*m_memberVariable) = value;
}
@@ -310,9 +307,6 @@ MakePtrAccessor (void (T::*setter) (Ptr<U>))
struct MemberMethod : public internal::PtrAccessor<T,U>
{
void (T::*m_setter) (Ptr<U>);
virtual MemberMethod *Copy (void) const {
return new MemberMethod (*this);
}
virtual void DoSet (T *object, Ptr<U> value) const {
(object->*m_setter) (value);
}
@@ -332,9 +326,6 @@ MakePtrAccessor (Ptr<U> (T::*getter) (void) const)
struct MemberMethod : public internal::PtrAccessor<T,U>
{
void (T::*m_getter) (Ptr<U>);
virtual MemberMethod *Copy (void) const {
return new MemberMethod (*this);
}
virtual void DoSet (T *object, Ptr<U> value) const {
//(object->*m_setter) (value);
}

3
src/core/object-factory.h
View File

@@ -35,7 +35,8 @@ template <typename T>
Ptr<T>
ObjectFactory::Create (void) const
{
return Create ()->GetObject<T> ();
Ptr<Object> object = Create ();
return object->GetObject<T> ();
}
} // namespace ns3