ns-3.24: comparison src/common/trace-container.h

equal deleted inserted replaced

-:2a105293177d
+:ed16b2078aa4
 * \param callback the callback being connected to the target event source
 *
 * This method targets only event sources which are variables of any unsigned
 * integer type.
 */
-void SetUiVariableCallback (char const *name,
+void SetUiVariableCallback (std::string const &name,
 Callback<void,uint64_t, uint64_t> callback);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source
 *
 * This method targets only event sources which are variables of any signed
 * integer type.
 */
-void SetSiVariableCallback (char const *name, Callback<void,int64_t, int64_t> callback);
+void SetSiVariableCallback (std::string const &name, Callback<void,int64_t, int64_t> callback);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source
 *
 * This method targets only event sources which are variables of any double type.
 */
-void SetFVariableCallback (char const *name, Callback<void,double, double> callback);
+void SetFVariableCallback (std::string const &name, Callback<void,double, double> callback);
 /**
 * \param name the name of the target event source
 * \param os the output stream being connected to the source trace stream
 *
 * This method targets only event sources which are of type StreamTracer.
 */
-void SetStream (char const *name, std::ostream *os);
+void SetStream (std::string const &name, std::ostream *os);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source.
 *
 * This method targets only event sources which are of type CallbackTracer<T1>
 */
 template <typename T1>
-void SetCallback (char const *name, Callback<void,T1> callback);
+void SetCallback (std::string const &name, Callback<void,T1> callback);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source.
 *
 * This method targets only event sources which are of type CallbackTracer<T1,T2>
 */
 template <typename T1, typename T2>
-void SetCallback (char const *name, Callback<void,T1,T2> callback);
+void SetCallback (std::string const &name, Callback<void,T1,T2> callback);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source.
 *
 * This method targets only event sources which are of type CallbackTracer<T1,T2,T3>
 */
 template <typename T1, typename T2, typename T3>
-void SetCallback (char const *name, Callback<void,T1,T2,T3> callback);
+void SetCallback (std::string const &name, Callback<void,T1,T2,T3> callback);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source.
 *
 * This method targets only event sources which are of type CallbackTracer<T1,T2,T3,T4>
 */
 template <typename T1, typename T2, typename T3, typename T4>
-void SetCallback (char const *name, Callback<void,T1,T2,T3,T4> callback);
+void SetCallback (std::string const&name, Callback<void,T1,T2,T3,T4> callback);
 /**
 * \param name the name of the target event source
 * \param callback the callback being connected to the target event source.
 *
 * This method targets only event sources which are of type CallbackTracer<T1,T2,T3,T4,T5>
 */
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
-void SetCallback (char const *name, Callback<void,T1,T2,T3,T4,T5> callback);
+void SetCallback (std::string const &name, Callback<void,T1,T2,T3,T4,T5> callback);
 /**
 * \param name the name of the registered event source
 * \param var the event source being registered
 *
 * This method registers only event sources of type "unsigned integer".
 */
-void RegisterUiVariable (char const *name, UiVariableTracerBase *var);
+void RegisterUiVariable (std::string const&name, UiVariableTracerBase *var);
 /**
 * \param name the name of the registered event source
 * \param var the event source being registered
 *
 * This method registers only event sources of type "signed integer".
 */
-void RegisterSiVariable (char const *name, SiVariableTracerBase *var);
+void RegisterSiVariable (std::string const&name, SiVariableTracerBase *var);
 /**
 * \param name the name of the registered event source
 * \param var the event source being registered
 *
 * This method registers only event sources of type "double".
 */
-void RegisterFVariable (char const *name, FVariableTracerBase *var);
+void RegisterFVariable (std::string const&name, FVariableTracerBase *var);
 /**
 * \param name the name of the registered event source
 * \param stream the event source being registered
 *
 * This method registers only event sources of type StreamTracer.
 */
-void RegisterStream (char const *name, StreamTracer *stream);
+void RegisterStream (std::string const&name, StreamTracer *stream);
 /**
 * \param name the name of the registeref event source
 * \param tracer the callback tracer being registered.
 *
 * This method registers only event sources of type CallbackTracer
 */
-void RegisterCallback (char const *name, CallbackTracerBase*tracer);
+void RegisterCallback (std::string const&name, CallbackTracerBase*tracer);
 /**
 * Print the list of registered event sources in this container only.
 */
 void PrintDebug (void);
 namespace ns3 {
 template <typename T1>
 void
-TraceContainer::SetCallback (char const *name, Callback<void,T1> callback)
+TraceContainer::SetCallback (std::string const&name, Callback<void,T1> callback)
 {
 for (CallbackListI i = m_callbackList.begin (); i != m_callbackList.end (); i++)
 {
 if (i->second == name)
 {
 }
 NS_ASSERT (false);
 }
 template <typename T1, typename T2>
 void
-TraceContainer::SetCallback (char const *name, Callback<void,T1,T2> callback)
+TraceContainer::SetCallback (std::string const&name, Callback<void,T1,T2> callback)
 {
 for (CallbackListI i = m_callbackList.begin (); i != m_callbackList.end (); i++)
 {
 if (i->second == name)
 {
 }
 NS_ASSERT (false);
 }
 template <typename T1, typename T2, typename T3>
 void
-TraceContainer::SetCallback (char const *name, Callback<void,T1,T2,T3> callback)
+TraceContainer::SetCallback (std::string const&name, Callback<void,T1,T2,T3> callback)
 {
 for (CallbackListI i = m_callbackList.begin (); i != m_callbackList.end (); i++)
 {
 if (i->second == name)
 {
 }
 NS_ASSERT (false);
 }
 template <typename T1, typename T2, typename T3, typename T4>
 void
-TraceContainer::SetCallback (char const *name, Callback<void,T1,T2,T3,T4> callback)
+TraceContainer::SetCallback (std::string const&name, Callback<void,T1,T2,T3,T4> callback)
 {
 for (CallbackListI i = m_callbackList.begin (); i != m_callbackList.end (); i++)
 {
 if (i->second == name)
 {
 }
 NS_ASSERT (false);
 }
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
 void
-TraceContainer::SetCallback (char const *name, Callback<void,T1,T2,T3,T4,T5> callback)
+TraceContainer::SetCallback (std::string const&name, Callback<void,T1,T2,T3,T4,T5> callback)
 {
 for (CallbackListI i = m_callbackList.begin (); i != m_callbackList.end (); i++)
 {
 if (i->second == name)
 {

changeset 315	ed16b2078aa4
parent 286	57e6a2006962