--- a/src/core/object.cc	Sun Aug 12 16:26:53 2007 +0200
+++ b/src/core/object.cc	Sun Aug 12 16:27:42 2007 +0200
@@ -167,7 +167,12 @@
 void 
 Object::TraceConnect (std::string path, const CallbackBase &cb)
 {
-  GetTraceResolver ()->Connect (path, cb, TraceContext ());
+  TraceConnect (path, cb, TraceContext ());
+}
+void 
+Object::TraceConnect (std::string path, const CallbackBase &cb, const TraceContext &context)
+{
+  GetTraceResolver ()->Connect (path, cb, context);
 }
 void 
 Object::TraceDisconnect (std::string path, const CallbackBase &cb)
@@ -190,7 +195,7 @@
 }
 
 Ptr<TraceResolver>
-Object::GetTraceResolver (void) const
+Object::GetTraceResolver (void)
 {
   return Create<EmptyTraceResolver> ();
 }

--- a/src/core/object.h	Sun Aug 12 16:26:53 2007 +0200
+++ b/src/core/object.h	Sun Aug 12 16:27:42 2007 +0200
@@ -28,6 +28,7 @@
 namespace ns3 {
 
 class TraceResolver;
+class TraceContext;
 class CallbackBase;
 
 /**
@@ -137,6 +138,7 @@
 
 
   void TraceConnect (std::string path, const CallbackBase &cb);
+  void TraceConnect (std::string path, const CallbackBase &cb, const TraceContext &context);
   void TraceDisconnect (std::string path, const CallbackBase &cb);
 protected:
   /**
@@ -154,7 +156,7 @@
    */
   virtual void DoDispose (void);
 
-  virtual Ptr<TraceResolver> GetTraceResolver (void) const;
+  virtual Ptr<TraceResolver> GetTraceResolver (void);
 private:
   Ptr<Object> DoQueryInterface (InterfaceId iid) const;
   bool Check (void) const;