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

remove const keyword and add a TraceConnect method which takes a TraceContext argument

Browse Source
This commit is contained in:
Mathieu Lacage
2007-08-12 16:27:42 +02:00
parent 6e762c1ae3
commit 2df1260c87
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/object.cc
View File

@@ -167,7 +167,12 @@ Object::AddInterface (Ptr<Object> o)
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 @@ Object::DoDispose (void)
}
Ptr<TraceResolver>
Object::GetTraceResolver (void) const
Object::GetTraceResolver (void)
{
return Create<EmptyTraceResolver> ();
}

4
src/core/object.h
View File

@@ -28,6 +28,7 @@
namespace ns3 {
class TraceResolver;
class TraceContext;
class CallbackBase;
/**
@@ -137,6 +138,7 @@ public:
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 @@ protected:
*/
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;