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

merge with trunk

Browse Source
This commit is contained in:
Mathieu Lacage
2007-08-06 17:21:57 +02:00
parent 77712a63ad caf9c39afa
commit 3fd0b3ba42
76 changed files with 2691 additions and 1411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/array-trace-resolver.h
View File

@@ -53,11 +53,11 @@ public:
*/
ArrayTraceResolver (TraceContext const &context,
Callback<uint32_t> getSize,
Callback<T *, uint32_t> get);
Callback<T, uint32_t> get);
private:
virtual TraceResolverList DoLookup (std::string id) const;
Callback<uint32_t> m_getSize;
Callback<T *, uint32_t> m_get;
Callback<T, uint32_t> m_get;
};
}//namespace ns3
@@ -66,7 +66,7 @@ namespace ns3 {
template <typename T, typename INDEX>
ArrayTraceResolver<T,INDEX>::ArrayTraceResolver (TraceContext const &context,
Callback<uint32_t> getSize,
Callback<T *, uint32_t> get)
Callback<T, uint32_t> get)
: TraceResolver (context),
m_getSize (getSize),
m_get (get)