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

use the new CallbackTracerBase::CheckCallbackType method to ensure proper type matching when invoking TraceContainer::SetCallback

Browse Source
This commit is contained in:
Mathieu Lacage
2007-02-05 12:42:16 +01:00
parent bcad837abd
commit 9df3f18084
1 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/common/trace-container.h
View File

@@ -196,9 +196,7 @@ private:
}; // namespace ns3
#ifndef NDEBUG
#include <cassert>
#endif
namespace ns3 {
@@ -210,13 +208,18 @@ TraceContainer::SetCallback (char const *name, Callback<void,T1> callback)
{
if (i->second == name)
{
static_cast<CallbackTracer<T1> *> (i->first)->SetCallback (callback);
return;
if (i->first->CheckCallbackType (callback))
{
static_cast<CallbackTracer<T1> *> (i->first)->SetCallback (callback);
return;
}
else
{
assert (!"non-matching callback");
}
}
}
#ifndef NDEBUG
assert (false);
#endif
}
template <typename T1, typename T2>
void
@@ -226,13 +229,18 @@ TraceContainer::SetCallback (char const *name, Callback<void,T1,T2> callback)
{
if (i->second == name)
{
static_cast<CallbackTracer<T1,T2> *> (i->first)->SetCallback (callback);
return;
if (i->first->CheckCallbackType (callback))
{
static_cast<CallbackTracer<T1,T2> *> (i->first)->SetCallback (callback);
return;
}
else
{
assert (!"non-matching callback");
}
}
}
#ifndef NDEBUG
assert (false);
#endif
}
template <typename T1, typename T2, typename T3>
void
@@ -242,13 +250,18 @@ TraceContainer::SetCallback (char const *name, Callback<void,T1,T2,T3> callback)
{
if (i->second == name)
{
static_cast<CallbackTracer<T1,T2,T3> *> (i->first)->SetCallback (callback);
return;
if (i->first->CheckCallbackType (callback))
{
static_cast<CallbackTracer<T1,T2,T3> *> (i->first)->SetCallback (callback);
return;
}
else
{
assert (!"non-matching callback");
}
}
}
#ifndef NDEBUG
assert (false);
#endif
}
template <typename T1, typename T2, typename T3, typename T4>
void
@@ -258,13 +271,18 @@ TraceContainer::SetCallback (char const *name, Callback<void,T1,T2,T3,T4> callba
{
if (i->second == name)
{
static_cast<CallbackTracer<T1,T2,T3,T4> *> (i->first)->SetCallback (callback);
return;
if (i->first->CheckCallbackType (callback))
{
static_cast<CallbackTracer<T1,T2,T3,T4> *> (i->first)->SetCallback (callback);
return;
}
else
{
assert (!"non-matching callback");
}
}
}
#ifndef NDEBUG
assert (false);
#endif
}
template <typename T1, typename T2, typename T3, typename T4, typename T5>
void
@@ -274,13 +292,18 @@ TraceContainer::SetCallback (char const *name, Callback<void,T1,T2,T3,T4,T5> cal
{
if (i->second == name)
{
static_cast<CallbackTracer<T1,T2,T3,T4,T5> *> (i->first)->SetCallback (callback);
return;
if (i->first->CheckCallbackType (callback))
{
static_cast<CallbackTracer<T1,T2,T3,T4,T5> *> (i->first)->SetCallback (callback);
return;
}
else
{
assert (!"non-matching callback");
}
}
}
#ifndef NDEBUG
assert (false);
#endif
}