tomh/ns-3-dev-spectrum-wifi: comparison src/common/trace-container.h

equal deleted inserted replaced

-:a5b06c32e28a
+:99e833adbb46
 #include "ns3/callback.h"
 #include "packet.h"
 #include <list>
 #include <string>
-namespace yans {
+namespace ns3 {
 class PacketLogger;
 class TraceStream;
 /**
 * their trace event sources. Model users use the TraceContainer
 * class to connect their trace event listeners to the
 * model trace event sources.
 *
 * TraceContainer can be used to register the following event sources:
-*   - yans::PacketLogger : can be connected to yans::PcapWriter
+*   - ns3::PacketLogger : can be connected to ns3::PcapWriter
-*   - yans::TraceStream : can be connected to any std::ostream
+*   - ns3::TraceStream : can be connected to any std::ostream
-*   - yans::CallbackLogger: can be connected to yans::Callback
+*   - ns3::CallbackLogger: can be connected to ns3::Callback
-*   - yans::UiTracedVariable
+*   - ns3::UiTracedVariable
-*   - yans::SiTracedVariable
+*   - ns3::SiTracedVariable
-*   - yans::FTracedVariable
+*   - ns3::FTracedVariable
 *
 * The following sample code shows how you can:
 *   - create trace event sources
 *   - register the trace event sources in a trace container
 *   - set event sinks to each event source
 	PacketLoggerList m_packet_logger_list;
 	TraceStreamList m_trace_stream_list;
 	CallbackList m_callback_list;
 };
-}; // namespace yans
+}; // namespace ns3
 #ifndef NDEBUG
 #include <cassert>
 #endif
-namespace yans {
+namespace ns3 {
 template <typename T1>
 void
 TraceContainer::set_callback (char const *name, Callback<void,T1> callback)
 {
 	assert (false);
 #endif
 }
-}; // namespace yans
+}; // namespace ns3
 #endif /* TRACED_VARIABLE_CONTAINER_H */

changeset 16	99e833adbb46
parent 14	6dd7d31c6fc3
child 40	90845b5a0049