remove ptr from ArrayTraceResolver

Mathieu Lacage 2007-05-10 07:25:47 +02:00
parent 2eb20b5743
commit 90a0cb3ad2
1 changed files with 4 additions and 5 deletions

View File

@ -24,7 +24,6 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#include "ns3/callback.h" #include "ns3/callback.h"
#include "ns3/ptr.h"
#include "trace-resolver.h" #include "trace-resolver.h"
namespace ns3 { namespace ns3 {
@ -82,11 +81,11 @@ public:
*/ */
ArrayTraceResolver (TraceContext const &context, ArrayTraceResolver (TraceContext const &context,
Callback<uint32_t> getSize, Callback<uint32_t> getSize,
Callback<Ptr<T>, uint32_t> get); Callback<T *, uint32_t> get);
private: private:
virtual TraceResolverList DoLookup (std::string id) const; virtual TraceResolverList DoLookup (std::string id) const;
Callback<uint32_t> m_getSize; Callback<uint32_t> m_getSize;
Callback<Ptr<T>, uint32_t> m_get; Callback<T *, uint32_t> m_get;
}; };
}//namespace ns3 }//namespace ns3
@ -108,8 +107,8 @@ ArrayTraceResolver<T>::Index::operator uint32_t ()
template <typename T> template <typename T>
ArrayTraceResolver<T>::ArrayTraceResolver (TraceContext const &context, ArrayTraceResolver<T>::ArrayTraceResolver (TraceContext const &context,
Callback<uint32_t> getSize, Callback<uint32_t> getSize,
Callback<Ptr<T>, uint32_t> get) Callback<T *, uint32_t> get)
: TraceResolver (context), : TraceResolver (context),
m_getSize (getSize), m_getSize (getSize),
m_get (get) m_get (get)