From 21466b9afee17e267602c242c3fc920d7929fbee Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <Mathieu.Lacage@sophia.inria.fr>
Date: Thu, 28 Feb 2008 08:59:06 -0800
Subject: [PATCH 1/2] Copy is not needed anymore.

---
 src/core/attribute.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/core/attribute.h b/src/core/attribute.h
index 06be059f2..023827114 100644
--- a/src/core/attribute.h
+++ b/src/core/attribute.h
@@ -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);
     }

From 8f6d84e66928dccefdbdbd95fb421625e2dbe650 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <Mathieu.Lacage@sophia.inria.fr>
Date: Thu, 28 Feb 2008 08:59:35 -0800
Subject: [PATCH 2/2] Use a temporary to avoid confusing the compiler.

---
 src/core/object-factory.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/object-factory.h b/src/core/object-factory.h
index 7da14ec9f..a3434310d 100644
--- a/src/core/object-factory.h
+++ b/src/core/object-factory.h
@@ -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