1.1 --- a/samples/main-callback.cc	Tue Aug 29 17:51:31 2006 +0200
     1.2 +++ b/samples/main-callback.cc	Tue Aug 29 17:55:34 2006 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  #include <cassert>
     1.5  #include <iostream>
     1.6  
     1.7 -using namespace yans;
     1.8 +using namespace ns3;
     1.9  
    1.10  static double 
    1.11  cb_one (double a, double b)

     2.1 --- a/samples/main-event.cc	Tue Aug 29 17:51:31 2006 +0200
     2.2 +++ b/samples/main-event.cc	Tue Aug 29 17:55:34 2006 +0200
     2.3 @@ -3,7 +3,7 @@
     2.4  #include "ns3/event.tcc"
     2.5  #include <iostream>
     2.6  
     2.7 -using namespace yans;
     2.8 +using namespace ns3;
     2.9  
    2.10  class MyModel {
    2.11  public:

     3.1 --- a/samples/main-packet.cc	Tue Aug 29 17:51:31 2006 +0200
     3.2 +++ b/samples/main-packet.cc	Tue Aug 29 17:55:34 2006 +0200
     3.3 @@ -3,7 +3,7 @@
     3.4  #include "ns3/chunk.h"
     3.5  #include <iostream>
     3.6  
     3.7 -using namespace yans;
     3.8 +using namespace ns3;
     3.9  
    3.10  /* A sample Chunk implementation
    3.11   */

     4.1 --- a/samples/main-simulator.cc	Tue Aug 29 17:51:31 2006 +0200
     4.2 +++ b/samples/main-simulator.cc	Tue Aug 29 17:55:34 2006 +0200
     4.3 @@ -4,7 +4,7 @@
     4.4  #include "ns3/simulator.h"
     4.5  #include <iostream>
     4.6  
     4.7 -using namespace yans;
     4.8 +using namespace ns3;
     4.9  
    4.10  class MyModel {
    4.11  public:

     5.1 --- a/samples/main-trace.cc	Tue Aug 29 17:51:31 2006 +0200
     5.2 +++ b/samples/main-trace.cc	Tue Aug 29 17:55:34 2006 +0200
     5.3 @@ -6,7 +6,7 @@
     5.4  #include "ns3/pcap-writer.h"
     5.5  #include <iostream>
     5.6  
     5.7 -using namespace yans;
     5.8 +using namespace ns3;
     5.9  
    5.10  PacketLogger a;
    5.11  UiTracedVariable<unsigned short> b;

     6.1 --- a/src/common/buffer.cc	Tue Aug 29 17:51:31 2006 +0200
     6.2 +++ b/src/common/buffer.cc	Tue Aug 29 17:55:34 2006 +0200
     6.3 @@ -25,7 +25,7 @@
     6.4  //#define TRACE(x) std::cout << x << std::endl;
     6.5  #define TRACE(x)
     6.6  
     6.7 -namespace yans {
     6.8 +namespace ns3 {
     6.9  
    6.10  Buffer::BufferDataList  Buffer::m_free_list;
    6.11  uint32_t Buffer::m_max_total_add_start = 0;
    6.12 @@ -109,12 +109,12 @@
    6.13  }
    6.14  #endif
    6.15  
    6.16 -}; // namespace yans
    6.17 +}; // namespace ns3
    6.18  
    6.19  
    6.20  #include <cassert>
    6.21  
    6.22 -namespace yans {
    6.23 +namespace ns3 {
    6.24  
    6.25  
    6.26  void 
    6.27 @@ -372,7 +372,7 @@
    6.28  
    6.29  
    6.30  
    6.31 -}; // namespace yans
    6.32 +}; // namespace ns3
    6.33  
    6.34  
    6.35  #ifdef RUN_SELF_TESTS
    6.36 @@ -380,7 +380,7 @@
    6.37  #include "ns3/test.h"
    6.38  #include <iomanip>
    6.39  
    6.40 -namespace yans {
    6.41 +namespace ns3 {
    6.42  
    6.43  class BufferTest: public Test {
    6.44  private:
    6.45 @@ -588,7 +588,7 @@
    6.46  
    6.47  static BufferTest g_buffer_test;
    6.48  
    6.49 -}; // namespace yans
    6.50 +}; // namespace ns3
    6.51  
    6.52  #endif /* RUN_SELF_TESTS */
    6.53  

     7.1 --- a/src/common/buffer.h	Tue Aug 29 17:51:31 2006 +0200
     7.2 +++ b/src/common/buffer.h	Tue Aug 29 17:55:34 2006 +0200
     7.3 @@ -24,7 +24,7 @@
     7.4  #include <stdint.h>
     7.5  #include <vector>
     7.6  
     7.7 -namespace yans {
     7.8 +namespace ns3 {
     7.9  
    7.10  /**
    7.11   * \brief automatically resized byte buffer
    7.12 @@ -257,7 +257,7 @@
    7.13  	 * byte buffer.
    7.14  	 *
    7.15  	 * The returned pointer points to an area of
    7.16 -	 * memory which is yans::Buffer::get_size () bytes big.
    7.17 +	 * memory which is ns3::Buffer::get_size () bytes big.
    7.18  	 * Please, try to never ever use this method. It is really
    7.19  	 * evil and is present only for a few specific uses.
    7.20  	 */
    7.21 @@ -353,11 +353,11 @@
    7.22  	uint32_t m_size;
    7.23  };
    7.24  
    7.25 -}; // namespace yans
    7.26 +}; // namespace ns3
    7.27  
    7.28  #include <cassert>
    7.29  
    7.30 -namespace yans {
    7.31 +namespace ns3 {
    7.32  
    7.33  Buffer::Buffer ()
    7.34  	: m_data (Buffer::create ()),
    7.35 @@ -684,7 +684,7 @@
    7.36  	m_current += size;
    7.37  }
    7.38  
    7.39 -}; // namespace yans
    7.40 +}; // namespace ns3
    7.41  
    7.42  
    7.43  #endif /* BUFFER_H */

     8.1 --- a/src/common/callback-logger.h	Tue Aug 29 17:51:31 2006 +0200
     8.2 +++ b/src/common/callback-logger.h	Tue Aug 29 17:55:34 2006 +0200
     8.3 @@ -24,15 +24,15 @@
     8.4  
     8.5  #include "ns3/callback.h"
     8.6  
     8.7 -namespace yans {
     8.8 +namespace ns3 {
     8.9  
    8.10  class CallbackLoggerBase {};
    8.11  
    8.12  /**
    8.13 - * \brief log arbitrary number of parameters to a matching yans:Callback
    8.14 + * \brief log arbitrary number of parameters to a matching ns3::Callback
    8.15   *
    8.16   * Whenever operator () is invoked on this class, the call and its arguments
    8.17 - * are forwarded to the internal matching yans::Callback.
    8.18 + * are forwarded to the internal matching ns3::Callback.
    8.19   */
    8.20  template<typename T1 = empty, typename T2 = empty, 
    8.21  	 typename T3 = empty, typename T4 = empty,
    8.22 @@ -79,6 +79,6 @@
    8.23  	Callback<void,T1,T2,T3,T4,T5> m_callback;
    8.24  };
    8.25  
    8.26 -}; // namespace yans
    8.27 +}; // namespace ns3
    8.28  
    8.29  #endif /* CALLBACK_LOGGER_H */

     9.1 --- a/src/common/chunk-constant-data.cc	Tue Aug 29 17:51:31 2006 +0200
     9.2 +++ b/src/common/chunk-constant-data.cc	Tue Aug 29 17:55:34 2006 +0200
     9.3 @@ -21,7 +21,7 @@
     9.4  
     9.5  #include "chunk-constant-data.h"
     9.6  
     9.7 -namespace yans {
     9.8 +namespace ns3 {
     9.9  
    9.10  ChunkConstantData::ChunkConstantData (uint32_t len, uint8_t data)
    9.11  	: m_len (len), m_data (data)
    9.12 @@ -60,4 +60,4 @@
    9.13  }
    9.14  
    9.15  
    9.16 -}; // namespace yans
    9.17 +}; // namespace ns3

    10.1 --- a/src/common/chunk-constant-data.h	Tue Aug 29 17:51:31 2006 +0200
    10.2 +++ b/src/common/chunk-constant-data.h	Tue Aug 29 17:55:34 2006 +0200
    10.3 @@ -25,7 +25,7 @@
    10.4  #include "chunk.h"
    10.5  #include <stdint.h>
    10.6  
    10.7 -namespace yans {
    10.8 +namespace ns3 {
    10.9  
   10.10  
   10.11  class ChunkConstantData : public Chunk {
   10.12 @@ -42,6 +42,6 @@
   10.13  	uint8_t m_data;
   10.14  };
   10.15  
   10.16 -}; // namespace yans
   10.17 +}; // namespace ns3
   10.18  
   10.19  #endif /* CHUNK_CONSTANT_DATA_H */

    11.1 --- a/src/common/chunk-llc-snap.cc	Tue Aug 29 17:51:31 2006 +0200
    11.2 +++ b/src/common/chunk-llc-snap.cc	Tue Aug 29 17:55:34 2006 +0200
    11.3 @@ -34,7 +34,7 @@
    11.4  #endif /* TRACE_CHUNK_LLC_SNAP */
    11.5  
    11.6  
    11.7 -namespace yans {
    11.8 +namespace ns3 {
    11.9  
   11.10  ChunkLlcSnap::ChunkLlcSnap ()
   11.11  {}
   11.12 @@ -91,4 +91,4 @@
   11.13  
   11.14  
   11.15  
   11.16 -}; // namespace yans
   11.17 +}; // namespace ns3

    12.1 --- a/src/common/chunk-llc-snap.h	Tue Aug 29 17:51:31 2006 +0200
    12.2 +++ b/src/common/chunk-llc-snap.h	Tue Aug 29 17:55:34 2006 +0200
    12.3 @@ -25,7 +25,7 @@
    12.4  #include "chunk.h"
    12.5  #include <stdint.h>
    12.6  
    12.7 -namespace yans {
    12.8 +namespace ns3 {
    12.9  
   12.10  class ChunkLlcSnap : public Chunk {
   12.11   public:
   12.12 @@ -50,6 +50,6 @@
   12.13  	uint16_t m_ether_type;
   12.14  };
   12.15  
   12.16 -}; // namespace yans
   12.17 +}; // namespace ns3
   12.18  
   12.19  #endif /* CHUNK_LLC_SNAP_H */

    13.1 --- a/src/common/chunk-utils.cc	Tue Aug 29 17:51:31 2006 +0200
    13.2 +++ b/src/common/chunk-utils.cc	Tue Aug 29 17:55:34 2006 +0200
    13.3 @@ -20,7 +20,7 @@
    13.4   */
    13.5  #include "chunk-utils.h"
    13.6  
    13.7 -namespace yans {
    13.8 +namespace ns3 {
    13.9  
   13.10  void write_to (Buffer::Iterator &i, Ipv4Address ad)
   13.11  {
   13.12 @@ -46,4 +46,4 @@
   13.13  
   13.14  
   13.15  
   13.16 -}; // namespace yans
   13.17 +}; // namespace ns3

    14.1 --- a/src/common/chunk-utils.h	Tue Aug 29 17:51:31 2006 +0200
    14.2 +++ b/src/common/chunk-utils.h	Tue Aug 29 17:55:34 2006 +0200
    14.3 @@ -25,7 +25,7 @@
    14.4  #include "ipv4-address.h"
    14.5  #include "mac-address.h"
    14.6  
    14.7 -namespace yans {
    14.8 +namespace ns3 {
    14.9  
   14.10  void write_to (Buffer::Iterator &i, Ipv4Address ad);
   14.11  void write_to (Buffer::Iterator &i, MacAddress ad);

    15.1 --- a/src/common/chunk.cc	Tue Aug 29 17:51:31 2006 +0200
    15.2 +++ b/src/common/chunk.cc	Tue Aug 29 17:55:34 2006 +0200
    15.3 @@ -22,7 +22,7 @@
    15.4  #include "chunk.h"
    15.5  #include <cassert>
    15.6  
    15.7 -namespace yans {
    15.8 +namespace ns3 {
    15.9  
   15.10  Chunk::Chunk ()
   15.11  	: m_must_peek_before_remove (false) {}
   15.12 @@ -62,4 +62,4 @@
   15.13  	return os;
   15.14  }
   15.15  
   15.16 -}; // namespace yans
   15.17 +}; // namespace ns3

    16.1 --- a/src/common/chunk.h	Tue Aug 29 17:51:31 2006 +0200
    16.2 +++ b/src/common/chunk.h	Tue Aug 29 17:55:34 2006 +0200
    16.3 @@ -26,7 +26,7 @@
    16.4  #include <ostream>
    16.5  #include "buffer.h"
    16.6  
    16.7 -namespace yans {
    16.8 +namespace ns3 {
    16.9  
   16.10  /**
   16.11   * \brief Protocol header serialization and deserialization.
   16.12 @@ -84,6 +84,6 @@
   16.13  
   16.14  std::ostream& operator<< (std::ostream& os, Chunk const& chunk);
   16.15  
   16.16 -}; // namespace yans
   16.17 +}; // namespace ns3
   16.18  
   16.19  #endif /* CHUNK_H */

    17.1 --- a/src/common/count-ptr-holder.tcc	Tue Aug 29 17:51:31 2006 +0200
    17.2 +++ b/src/common/count-ptr-holder.tcc	Tue Aug 29 17:55:34 2006 +0200
    17.3 @@ -22,7 +22,7 @@
    17.4  #ifndef COUNT_PTR_HOLDER_TCC
    17.5  #define COUNT_PTR_HOLDER_TCC
    17.6  
    17.7 -namespace yans {
    17.8 +namespace ns3 {
    17.9  
   17.10  template <typename T>
   17.11  class CountPtrHolder {
   17.12 @@ -65,6 +65,6 @@
   17.13  	return CountPtrHolder<T const> (t);
   17.14  }
   17.15  
   17.16 -}; // namespace yans
   17.17 +}; // namespace ns3
   17.18  
   17.19  #endif /* REF_HOLDER_TCC */

    18.1 --- a/src/common/data-writer.cc	Tue Aug 29 17:51:31 2006 +0200
    18.2 +++ b/src/common/data-writer.cc	Tue Aug 29 17:55:34 2006 +0200
    18.3 @@ -42,7 +42,7 @@
    18.4  #define BUFFER_SIZE (4096)
    18.5  
    18.6  
    18.7 -namespace yans {
    18.8 +namespace ns3 {
    18.9  
   18.10  class DataWriterPrivate {
   18.11  public:

    19.1 --- a/src/common/data-writer.h	Tue Aug 29 17:51:31 2006 +0200
    19.2 +++ b/src/common/data-writer.h	Tue Aug 29 17:55:34 2006 +0200
    19.3 @@ -24,7 +24,7 @@
    19.4  
    19.5  #include <stdint.h>
    19.6  
    19.7 -namespace yans {
    19.8 +namespace ns3 {
    19.9  
   19.10  class DataWriterPrivate;
   19.11  
   19.12 @@ -39,6 +39,6 @@
   19.13  	DataWriterPrivate *m_priv;
   19.14  };
   19.15  
   19.16 -}; //namespace yans
   19.17 +}; //namespace ns3
   19.18  
   19.19  #endif /* DATA_WRITER_H */

    20.1 --- a/src/common/f-traced-variable.tcc	Tue Aug 29 17:51:31 2006 +0200
    20.2 +++ b/src/common/f-traced-variable.tcc	Tue Aug 29 17:55:34 2006 +0200
    20.3 @@ -25,7 +25,7 @@
    20.4  #include "ns3/callback.h"
    20.5  #include <stdint.h>
    20.6  
    20.7 -namespace yans {
    20.8 +namespace ns3 {
    20.9  
   20.10  class FTracedVariableBase {
   20.11  public:
   20.12 @@ -53,6 +53,6 @@
   20.13  };
   20.14  
   20.15  
   20.16 -}; // namespace yans
   20.17 +}; // namespace ns3
   20.18  
   20.19  #endif /* F_TRACED_VARIABLE_TCC */

    21.1 --- a/src/common/ipv4-address.cc	Tue Aug 29 17:51:31 2006 +0200
    21.2 +++ b/src/common/ipv4-address.cc	Tue Aug 29 17:55:34 2006 +0200
    21.3 @@ -22,7 +22,7 @@
    21.4  #include "utils.h"
    21.5  #include "ipv4-address.h"
    21.6  
    21.7 -namespace yans {
    21.8 +namespace ns3 {
    21.9  
   21.10  Ipv4Mask::Ipv4Mask ()
   21.11  	: m_mask (0x66666666)
   21.12 @@ -200,4 +200,4 @@
   21.13  }
   21.14  
   21.15  
   21.16 -}; // namespace yans
   21.17 +}; // namespace ns3

    22.1 --- a/src/common/ipv4-address.h	Tue Aug 29 17:51:31 2006 +0200
    22.2 +++ b/src/common/ipv4-address.h	Tue Aug 29 17:55:34 2006 +0200
    22.3 @@ -25,7 +25,7 @@
    22.4  #include <stdint.h>
    22.5  #include <ostream>
    22.6  
    22.7 -namespace yans {
    22.8 +namespace ns3 {
    22.9  
   22.10  /* Ipv4 addresses are stored in host order in
   22.11   * this class.
   22.12 @@ -102,6 +102,6 @@
   22.13  };
   22.14  bool operator != (Ipv4Address const &a, Ipv4Address const &b);
   22.15  
   22.16 -}; // namespace yans
   22.17 +}; // namespace ns3
   22.18  
   22.19  #endif /* IPV4_ADDRESS_H */

    23.1 --- a/src/common/ipv4-network-interface.cc	Tue Aug 29 17:51:31 2006 +0200
    23.2 +++ b/src/common/ipv4-network-interface.cc	Tue Aug 29 17:55:34 2006 +0200
    23.3 @@ -20,7 +20,7 @@
    23.4   */
    23.5  #include "ipv4-network-interface.h"
    23.6  
    23.7 -namespace yans {
    23.8 +namespace ns3 {
    23.9  
   23.10  Ipv4NetworkInterface::~Ipv4NetworkInterface ()
   23.11  {}
   23.12 @@ -79,4 +79,4 @@
   23.13  
   23.14  
   23.15  
   23.16 -}; // namespace yans
   23.17 +}; // namespace ns3

    24.1 --- a/src/common/ipv4-network-interface.h	Tue Aug 29 17:51:31 2006 +0200
    24.2 +++ b/src/common/ipv4-network-interface.h	Tue Aug 29 17:55:34 2006 +0200
    24.3 @@ -25,7 +25,7 @@
    24.4  #include "ns3/callback.h"
    24.5  #include "packet.h"
    24.6  
    24.7 -namespace yans {
    24.8 +namespace ns3 {
    24.9  
   24.10  class Packet;
   24.11  
   24.12 @@ -54,6 +54,6 @@
   24.13  	Ipv4Mask m_mask;
   24.14  };
   24.15  
   24.16 -}; // namespace yans
   24.17 +}; // namespace ns3
   24.18  
   24.19  #endif /* IPV4_NETWORK_INTERFACE */

    25.1 --- a/src/common/llc-snap-encapsulation.cc	Tue Aug 29 17:51:31 2006 +0200
    25.2 +++ b/src/common/llc-snap-encapsulation.cc	Tue Aug 29 17:55:34 2006 +0200
    25.3 @@ -25,7 +25,7 @@
    25.4  #include "mac-network-interface.h"
    25.5  #include <cassert>
    25.6  
    25.7 -namespace yans {
    25.8 +namespace ns3 {
    25.9  
   25.10  uint32_t
   25.11  LlcSnapEncapsulation::get_overhead (void) const
   25.12 @@ -86,4 +86,4 @@
   25.13  	}
   25.14  }
   25.15  
   25.16 -}; // namespace yans
   25.17 +}; // namespace ns3

    26.1 --- a/src/common/llc-snap-encapsulation.h	Tue Aug 29 17:51:31 2006 +0200
    26.2 +++ b/src/common/llc-snap-encapsulation.h	Tue Aug 29 17:55:34 2006 +0200
    26.3 @@ -26,7 +26,7 @@
    26.4  #include "mac-address.h"
    26.5  #include "packet.h"
    26.6  
    26.7 -namespace yans {
    26.8 +namespace ns3 {
    26.9  
   26.10  class MacNetworkInterface;
   26.11  
   26.12 @@ -47,6 +47,6 @@
   26.13  	MacNetworkInterface *m_interface;
   26.14  };
   26.15  
   26.16 -}; // namespace yans
   26.17 +}; // namespace ns3
   26.18  
   26.19  #endif /* LLC_SNAP_ENCAPSULATION */

    27.1 --- a/src/common/mac-address-factory.cc	Tue Aug 29 17:51:31 2006 +0200
    27.2 +++ b/src/common/mac-address-factory.cc	Tue Aug 29 17:55:34 2006 +0200
    27.3 @@ -20,7 +20,7 @@
    27.4   */
    27.5  #include "mac-address-factory.h"
    27.6  
    27.7 -namespace yans {
    27.8 +namespace ns3 {
    27.9  
   27.10  MacAddressFactory::MacAddressFactory ()
   27.11  {
   27.12 @@ -43,4 +43,4 @@
   27.13  	return MacAddress (m_addr);
   27.14  }
   27.15  
   27.16 -}; // namespace yans
   27.17 +}; // namespace ns3

    28.1 --- a/src/common/mac-address-factory.h	Tue Aug 29 17:51:31 2006 +0200
    28.2 +++ b/src/common/mac-address-factory.h	Tue Aug 29 17:55:34 2006 +0200
    28.3 @@ -23,7 +23,7 @@
    28.4  
    28.5  #include "mac-address.h"
    28.6  
    28.7 -namespace yans {
    28.8 +namespace ns3 {
    28.9  
   28.10  class MacAddressFactory {
   28.11  public:
   28.12 @@ -35,6 +35,6 @@
   28.13  	uint8_t m_index;
   28.14  };
   28.15  
   28.16 -}; // namespace yans
   28.17 +}; // namespace ns3
   28.18  
   28.19  #endif /* MAC_ADDRESS_FACTORY_H */

    29.1 --- a/src/common/mac-address.cc	Tue Aug 29 17:51:31 2006 +0200
    29.2 +++ b/src/common/mac-address.cc	Tue Aug 29 17:55:34 2006 +0200
    29.3 @@ -22,7 +22,7 @@
    29.4  #include "mac-address.h"
    29.5  #include "utils.h"
    29.6  
    29.7 -namespace yans {
    29.8 +namespace ns3 {
    29.9  
   29.10  MacAddress::MacAddress ()
   29.11  {
   29.12 @@ -184,4 +184,4 @@
   29.13  }
   29.14  
   29.15  
   29.16 -}; // namespace yans
   29.17 +}; // namespace ns3

    30.1 --- a/src/common/mac-address.h	Tue Aug 29 17:51:31 2006 +0200
    30.2 +++ b/src/common/mac-address.h	Tue Aug 29 17:55:34 2006 +0200
    30.3 @@ -25,7 +25,7 @@
    30.4  #include <stdint.h>
    30.5  #include <ostream>
    30.6  
    30.7 -namespace yans {
    30.8 +namespace ns3 {
    30.9  
   30.10  class MacAddress {
   30.11  public:
   30.12 @@ -67,6 +67,6 @@
   30.13  
   30.14  std::ostream& operator<< (std::ostream& os, MacAddress const& address);
   30.15  
   30.16 -}; // namespace yans
   30.17 +}; // namespace ns3
   30.18  
   30.19  #endif /* MAC_ADDRESS_H */

    31.1 --- a/src/common/mac-network-interface.cc	Tue Aug 29 17:51:31 2006 +0200
    31.2 +++ b/src/common/mac-network-interface.cc	Tue Aug 29 17:55:34 2006 +0200
    31.3 @@ -20,7 +20,7 @@
    31.4   */
    31.5  #include "mac-network-interface.h"
    31.6  
    31.7 -namespace yans {
    31.8 +namespace ns3 {
    31.9  
   31.10  MacNetworkInterface::MacNetworkInterface (MacAddress self, uint16_t max_mtu)
   31.11  	: m_self (self), m_max_mtu (max_mtu), m_mtu (max_mtu)
   31.12 @@ -93,4 +93,4 @@
   31.13  	m_status_change_callback (this);
   31.14  }
   31.15  
   31.16 -}; // namespace yans
   31.17 +}; // namespace ns3

    32.1 --- a/src/common/mac-network-interface.h	Tue Aug 29 17:51:31 2006 +0200
    32.2 +++ b/src/common/mac-network-interface.h	Tue Aug 29 17:55:34 2006 +0200
    32.3 @@ -26,7 +26,7 @@
    32.4  #include "mac-address.h"
    32.5  #include "packet.h"
    32.6  
    32.7 -namespace yans {
    32.8 +namespace ns3 {
    32.9  
   32.10  class MacNetworkInterface {
   32.11  public:
   32.12 @@ -63,6 +63,6 @@
   32.13  	bool m_is_down;
   32.14  };
   32.15  
   32.16 -}; // namespace yans
   32.17 +}; // namespace ns3
   32.18  
   32.19  #endif /* MAC_NETWORK_INTERFACE_H */

    33.1 --- a/src/common/packet-logger.cc	Tue Aug 29 17:51:31 2006 +0200
    33.2 +++ b/src/common/packet-logger.cc	Tue Aug 29 17:55:34 2006 +0200
    33.3 @@ -21,7 +21,7 @@
    33.4  
    33.5  #include "packet-logger.h"
    33.6  
    33.7 -namespace yans {
    33.8 +namespace ns3 {
    33.9  
   33.10  PacketLogger::PacketLogger ()
   33.11  {}
   33.12 @@ -38,5 +38,5 @@
   33.13  	m_callback = callback;
   33.14  }
   33.15  
   33.16 -}; // namespace yans
   33.17 +}; // namespace ns3
   33.18  

    34.1 --- a/src/common/packet-logger.h	Tue Aug 29 17:51:31 2006 +0200
    34.2 +++ b/src/common/packet-logger.h	Tue Aug 29 17:55:34 2006 +0200
    34.3 @@ -25,7 +25,7 @@
    34.4  #include "ns3/callback.h"
    34.5  #include "packet.h"
    34.6  
    34.7 -namespace yans {
    34.8 +namespace ns3 {
    34.9  
   34.10  /**
   34.11   * \brief log packets
   34.12 @@ -48,6 +48,6 @@
   34.13  	PacketLoggerCallback m_callback;
   34.14  };
   34.15  
   34.16 -}; // namespace yans
   34.17 +}; // namespace ns3
   34.18  
   34.19  #endif /* PACKET_LOGGER_H */

    35.1 --- a/src/common/packet.cc	Tue Aug 29 17:51:31 2006 +0200
    35.2 +++ b/src/common/packet.cc	Tue Aug 29 17:55:34 2006 +0200
    35.3 @@ -21,7 +21,7 @@
    35.4  #include "packet.h"
    35.5  #include <cassert>
    35.6  
    35.7 -namespace yans {
    35.8 +namespace ns3 {
    35.9  
   35.10  Packet::Packet ()
   35.11  	: m_buffer () {}
   35.12 @@ -124,4 +124,4 @@
   35.13  	m_tags.remove_all ();
   35.14  }
   35.15  
   35.16 -}; // namespace yans
   35.17 +}; // namespace ns3

    36.1 --- a/src/common/packet.h	Tue Aug 29 17:51:31 2006 +0200
    36.2 +++ b/src/common/packet.h	Tue Aug 29 17:55:34 2006 +0200
    36.3 @@ -27,7 +27,7 @@
    36.4  #include "tags.h"
    36.5  #include "ns3/callback.h"
    36.6  
    36.7 -namespace yans {
    36.8 +namespace ns3 {
    36.9  
   36.10  class Packet {
   36.11  public:
   36.12 @@ -60,9 +60,9 @@
   36.13  	Tags m_tags;
   36.14  };
   36.15  
   36.16 -}; // namespace yans
   36.17 +}; // namespace ns3
   36.18  
   36.19 -namespace yans {
   36.20 +namespace ns3 {
   36.21  
   36.22  template <typename T>
   36.23  void Packet::add_tag (T const*tag)
   36.24 @@ -85,6 +85,6 @@
   36.25  	return m_tags.update (tag);
   36.26  }
   36.27  
   36.28 -}; // namespace yans
   36.29 +}; // namespace ns3
   36.30  
   36.31  #endif /* PACKET_H */

    37.1 --- a/src/common/pcap-writer.cc	Tue Aug 29 17:51:31 2006 +0200
    37.2 +++ b/src/common/pcap-writer.cc	Tue Aug 29 17:55:34 2006 +0200
    37.3 @@ -30,7 +30,7 @@
    37.4  #include "packet.h"
    37.5  
    37.6  
    37.7 -namespace yans {
    37.8 +namespace ns3 {
    37.9  
   37.10  enum {
   37.11  	PCAP_ETHERNET = 1
   37.12 @@ -96,4 +96,4 @@
   37.13  	m_writer->write ((uint8_t*)&data, 2);
   37.14  }
   37.15  
   37.16 -}; // namespace yans
   37.17 +}; // namespace ns3

    38.1 --- a/src/common/pcap-writer.h	Tue Aug 29 17:51:31 2006 +0200
    38.2 +++ b/src/common/pcap-writer.h	Tue Aug 29 17:55:34 2006 +0200
    38.3 @@ -26,7 +26,7 @@
    38.4  #include <stdint.h>
    38.5  #include "packet.h"
    38.6  
    38.7 -namespace yans {
    38.8 +namespace ns3 {
    38.9  
   38.10  class SystemFile;
   38.11  
   38.12 @@ -68,6 +68,6 @@
   38.13  	Callback<void,uint8_t *,uint32_t> m_write_callback;
   38.14  };
   38.15  
   38.16 -}; // namespace yans
   38.17 +}; // namespace ns3
   38.18  
   38.19  #endif /* PCAP_WRITER_H */

    39.1 --- a/src/common/population-analysis.cc	Tue Aug 29 17:51:31 2006 +0200
    39.2 +++ b/src/common/population-analysis.cc	Tue Aug 29 17:55:34 2006 +0200
    39.3 @@ -29,7 +29,7 @@
    39.4     http://cutebugs.net/code/treegrowth-stable.
    39.5   */
    39.6  
    39.7 -namespace yans {
    39.8 +namespace ns3 {
    39.9  
   39.10  PopulationAnalysis::PopulationAnalysis ()
   39.11  {
   39.12 @@ -91,4 +91,4 @@
   39.13          return m_square_sum / (m_n - 1);
   39.14  }
   39.15  
   39.16 -}; // namespace yans
   39.17 +}; // namespace ns3

    40.1 --- a/src/common/population-analysis.h	Tue Aug 29 17:51:31 2006 +0200
    40.2 +++ b/src/common/population-analysis.h	Tue Aug 29 17:55:34 2006 +0200
    40.3 @@ -25,7 +25,7 @@
    40.4  
    40.5  #include <stdint.h>
    40.6  
    40.7 -namespace yans {
    40.8 +namespace ns3 {
    40.9  
   40.10  class PopulationAnalysis {
   40.11  public:
   40.12 @@ -49,7 +49,7 @@
   40.13  	uint32_t m_n;
   40.14  };
   40.15  
   40.16 -}; // namespace yans
   40.17 +}; // namespace ns3
   40.18  
   40.19  
   40.20  #endif /* POPULATION_ANALYSIS_H */

    41.1 --- a/src/common/position.cc	Tue Aug 29 17:51:31 2006 +0200
    41.2 +++ b/src/common/position.cc	Tue Aug 29 17:55:34 2006 +0200
    41.3 @@ -21,7 +21,7 @@
    41.4  #include "position.h"
    41.5  #include <math.h>
    41.6  
    41.7 -namespace yans {
    41.8 +namespace ns3 {
    41.9  
   41.10  Position::~Position ()
   41.11  {}
   41.12 @@ -44,4 +44,4 @@
   41.13  	return sqrt (dx*dx+dy*dy+dz*dz);
   41.14  }
   41.15  
   41.16 -}; // namespace yans
   41.17 +}; // namespace ns3

    42.1 --- a/src/common/position.h	Tue Aug 29 17:51:31 2006 +0200
    42.2 +++ b/src/common/position.h	Tue Aug 29 17:55:34 2006 +0200
    42.3 @@ -21,7 +21,7 @@
    42.4  #ifndef POSITION_H
    42.5  #define POSITION_H
    42.6  
    42.7 -namespace yans {
    42.8 +namespace ns3 {
    42.9  
   42.10  class Position {
   42.11  public:
   42.12 @@ -33,6 +33,6 @@
   42.13  	virtual void real_get (double &x, double &y, double &z) const = 0;
   42.14  };
   42.15  
   42.16 -}; // namespace yans
   42.17 +}; // namespace ns3
   42.18  
   42.19  #endif /* POSITION_H */

    43.1 --- a/src/common/ref-ptr.h	Tue Aug 29 17:51:31 2006 +0200
    43.2 +++ b/src/common/ref-ptr.h	Tue Aug 29 17:55:34 2006 +0200
    43.3 @@ -22,7 +22,7 @@
    43.4  #ifndef REF_PTR_H
    43.5  #define REF_PTR_H
    43.6  
    43.7 -namespace yans {
    43.8 +namespace ns3 {
    43.9  
   43.10  template <typename T>
   43.11  class RefPtr {
   43.12 @@ -134,6 +134,6 @@
   43.13  	}
   43.14  };
   43.15  
   43.16 -}; // namespace yans
   43.17 +}; // namespace ns3
   43.18  
   43.19  #endif /* REF_PTR_H */

    44.1 --- a/src/common/seed-generator-mrg32k3a.cc	Tue Aug 29 17:51:31 2006 +0200
    44.2 +++ b/src/common/seed-generator-mrg32k3a.cc	Tue Aug 29 17:55:34 2006 +0200
    44.3 @@ -21,7 +21,7 @@
    44.4  #include "seed-generator.h"
    44.5  #include "rng-mrg32k3a.h"
    44.6  
    44.7 -namespace yans {
    44.8 +namespace ns3 {
    44.9  
   44.10  class SeedGeneratorPrivate {
   44.11  public:
   44.12 @@ -58,4 +58,4 @@
   44.13  	return SeedGeneratorPrivate::get ();
   44.14  }
   44.15  
   44.16 -}; // namespace yans
   44.17 +}; // namespace ns3

    45.1 --- a/src/common/seed-generator.h	Tue Aug 29 17:51:31 2006 +0200
    45.2 +++ b/src/common/seed-generator.h	Tue Aug 29 17:55:34 2006 +0200
    45.3 @@ -23,7 +23,7 @@
    45.4  
    45.5  #include <stdint.h>
    45.6  
    45.7 -namespace yans {
    45.8 +namespace ns3 {
    45.9  
   45.10  class SeedGeneratorPrivate;
   45.11  
   45.12 @@ -35,6 +35,6 @@
   45.13  	SeedGenerator ();
   45.14  };
   45.15  
   45.16 -}; // namespace yans
   45.17 +}; // namespace ns3
   45.18  
   45.19  #endif /* SEED_GENERATOR_H */

    46.1 --- a/src/common/si-traced-variable.tcc	Tue Aug 29 17:51:31 2006 +0200
    46.2 +++ b/src/common/si-traced-variable.tcc	Tue Aug 29 17:55:34 2006 +0200
    46.3 @@ -25,7 +25,7 @@
    46.4  #include "ns3/callback.h"
    46.5  #include <stdint.h>
    46.6  
    46.7 -namespace yans {
    46.8 +namespace ns3 {
    46.9  
   46.10  class SiTracedVariableBase {
   46.11  public:
   46.12 @@ -66,12 +66,12 @@
   46.13   *
   46.14   * To instantiate a 32-bit signed variable (to store
   46.15   * a TCP counter for example), you would create a variable of type
   46.16 - * yans::UiTracedVariable<int32_t> :
   46.17 + * ns3::UiTracedVariable<int32_t> :
   46.18   \code
   46.19   #include <stdint.h>
   46.20   #include "ns3/si-traced-variable.tcc"
   46.21  
   46.22 - yans::SiTracedVariable<uint16_t> var;
   46.23 + ns3::SiTracedVariable<uint16_t> var;
   46.24   \endcode
   46.25   * and you would use it like any other variable of type int32_t:
   46.26   \code
   46.27 @@ -232,6 +232,6 @@
   46.28  	return lhs;
   46.29  }
   46.30  
   46.31 -}; // namespace yans
   46.32 +}; // namespace ns3
   46.33  
   46.34  #endif /* TRACED_VARIABLE_TCC */

    47.1 --- a/src/common/static-position.cc	Tue Aug 29 17:51:31 2006 +0200
    47.2 +++ b/src/common/static-position.cc	Tue Aug 29 17:55:34 2006 +0200
    47.3 @@ -20,7 +20,7 @@
    47.4   */
    47.5  #include "static-position.h"
    47.6  
    47.7 -namespace yans {
    47.8 +namespace ns3 {
    47.9  
   47.10  StaticPosition::StaticPosition ()
   47.11  	: m_x (0.0), m_y (0.0), m_z (0.0)
   47.12 @@ -43,4 +43,4 @@
   47.13  	z = m_z;
   47.14  }
   47.15  
   47.16 -}; // namespace yans
   47.17 +}; // namespace ns3

    48.1 --- a/src/common/static-position.h	Tue Aug 29 17:51:31 2006 +0200
    48.2 +++ b/src/common/static-position.h	Tue Aug 29 17:55:34 2006 +0200
    48.3 @@ -23,7 +23,7 @@
    48.4  
    48.5  #include "position.h"
    48.6  
    48.7 -namespace yans {
    48.8 +namespace ns3 {
    48.9  
   48.10  class StaticPosition : public Position {
   48.11  public:
   48.12 @@ -38,6 +38,6 @@
   48.13  	double m_z;
   48.14  };
   48.15  
   48.16 -}; // namespace yans
   48.17 +}; // namespace ns3
   48.18  
   48.19  #endif /* STATIC_POSITION_H */

    49.1 --- a/src/common/static-speed-position.cc	Tue Aug 29 17:51:31 2006 +0200
    49.2 +++ b/src/common/static-speed-position.cc	Tue Aug 29 17:55:34 2006 +0200
    49.3 @@ -21,7 +21,7 @@
    49.4  #include "static-speed-position.h"
    49.5  #include "ns3/simulator.h"
    49.6  
    49.7 -namespace yans {
    49.8 +namespace ns3 {
    49.9  
   49.10  StaticSpeedPosition::StaticSpeedPosition ()
   49.11  	: m_x (0.0),
   49.12 @@ -65,4 +65,4 @@
   49.13  	z = m_z;
   49.14  }
   49.15  
   49.16 -}; // namespace yans
   49.17 +}; // namespace ns3

    50.1 --- a/src/common/static-speed-position.h	Tue Aug 29 17:51:31 2006 +0200
    50.2 +++ b/src/common/static-speed-position.h	Tue Aug 29 17:55:34 2006 +0200
    50.3 @@ -24,7 +24,7 @@
    50.4  #include <stdint.h>
    50.5  #include "position.h"
    50.6  
    50.7 -namespace yans {
    50.8 +namespace ns3 {
    50.9  
   50.10  class StaticSpeedPosition : public Position {
   50.11  public:
   50.12 @@ -46,6 +46,6 @@
   50.13  	mutable uint64_t m_prev_us;
   50.14  };
   50.15  
   50.16 -}; // namespace yans
   50.17 +}; // namespace ns3
   50.18  
   50.19  #endif /* STATIC_SPEED_POSITION */

    51.1 --- a/src/common/tags.cc	Tue Aug 29 17:51:31 2006 +0200
    51.2 +++ b/src/common/tags.cc	Tue Aug 29 17:55:34 2006 +0200
    51.3 @@ -21,7 +21,7 @@
    51.4  #include "tags.h"
    51.5  #include <string.h>
    51.6  
    51.7 -namespace yans {
    51.8 +namespace ns3 {
    51.9  
   51.10  TagsPrettyPrinterRegistry::PrettyPrinters TagsPrettyPrinterRegistry::g_pretty_printers;
   51.11  
   51.12 @@ -174,7 +174,7 @@
   51.13  }
   51.14  
   51.15  
   51.16 -}; // namespace yans
   51.17 +}; // namespace ns3
   51.18  
   51.19  #ifdef RUN_SELF_TESTS
   51.20  
   51.21 @@ -182,7 +182,7 @@
   51.22  #include <iomanip>
   51.23  #include <iostream>
   51.24  
   51.25 -namespace yans {
   51.26 +namespace ns3 {
   51.27  
   51.28  class TagsTest : Test {
   51.29  public:
   51.30 @@ -316,7 +316,7 @@
   51.31  static TagsTest g_tags_test;
   51.32  
   51.33  
   51.34 -}; // namespace yans
   51.35 +}; // namespace ns3
   51.36  
   51.37  #endif /* RUN_SELF_TESTS */
   51.38  

    52.1 --- a/src/common/tags.h	Tue Aug 29 17:51:31 2006 +0200
    52.2 +++ b/src/common/tags.h	Tue Aug 29 17:55:34 2006 +0200
    52.3 @@ -25,7 +25,7 @@
    52.4  #include <ostream>
    52.5  #include <vector>
    52.6  
    52.7 -namespace yans {
    52.8 +namespace ns3 {
    52.9  
   52.10  template <typename T>
   52.11  class TagPrettyPrinter;
   52.12 @@ -110,13 +110,13 @@
   52.13  };
   52.14  
   52.15  
   52.16 -}; // namespace yans
   52.17 +}; // namespace ns3
   52.18  
   52.19  
   52.20  #include <cassert>
   52.21  #include <string.h>
   52.22  
   52.23 -namespace yans {
   52.24 +namespace ns3 {
   52.25  
   52.26  /**
   52.27   * The TypeUid class is used to create a mapping Type --> uid
   52.28 @@ -287,6 +287,6 @@
   52.29  }
   52.30  
   52.31  
   52.32 -}; // namespace yans
   52.33 +}; // namespace ns3
   52.34  
   52.35  #endif /* TAGS_H */

    53.1 --- a/src/common/trace-container.cc	Tue Aug 29 17:51:31 2006 +0200
    53.2 +++ b/src/common/trace-container.cc	Tue Aug 29 17:55:34 2006 +0200
    53.3 @@ -25,7 +25,7 @@
    53.4  #include <utility>
    53.5  #include <cassert>
    53.6  
    53.7 -namespace yans {
    53.8 +namespace ns3 {
    53.9  
   53.10  TraceContainer::TraceContainer ()
   53.11  {}
   53.12 @@ -158,11 +158,11 @@
   53.13  
   53.14  
   53.15  
   53.16 -}; // namespace yans
   53.17 +}; // namespace ns3
   53.18  
   53.19  #include <iostream>
   53.20  void 
   53.21 -yans::TraceContainer::print_debug (void)
   53.22 +ns3::TraceContainer::print_debug (void)
   53.23  {
   53.24  	if (!m_ui_list.empty ()) {
   53.25  		std::cout << "ui var: " << std::endl;

    54.1 --- a/src/common/trace-container.h	Tue Aug 29 17:51:31 2006 +0200
    54.2 +++ b/src/common/trace-container.h	Tue Aug 29 17:55:34 2006 +0200
    54.3 @@ -31,7 +31,7 @@
    54.4  #include <list>
    54.5  #include <string>
    54.6  
    54.7 -namespace yans {
    54.8 +namespace ns3 {
    54.9  
   54.10  class PacketLogger;
   54.11  class TraceStream;
   54.12 @@ -45,12 +45,12 @@
   54.13   * model trace event sources.
   54.14   *
   54.15   * TraceContainer can be used to register the following event sources:
   54.16 - *   - yans::PacketLogger : can be connected to yans::PcapWriter
   54.17 - *   - yans::TraceStream : can be connected to any std::ostream
   54.18 - *   - yans::CallbackLogger: can be connected to yans::Callback
   54.19 - *   - yans::UiTracedVariable
   54.20 - *   - yans::SiTracedVariable
   54.21 - *   - yans::FTracedVariable
   54.22 + *   - ns3::PacketLogger : can be connected to ns3::PcapWriter
   54.23 + *   - ns3::TraceStream : can be connected to any std::ostream
   54.24 + *   - ns3::CallbackLogger: can be connected to ns3::Callback
   54.25 + *   - ns3::UiTracedVariable
   54.26 + *   - ns3::SiTracedVariable
   54.27 + *   - ns3::FTracedVariable
   54.28   *
   54.29   * The following sample code shows how you can:
   54.30   *   - create trace event sources
   54.31 @@ -214,13 +214,13 @@
   54.32  	CallbackList m_callback_list;
   54.33  };
   54.34  
   54.35 -}; // namespace yans
   54.36 +}; // namespace ns3
   54.37  
   54.38  #ifndef NDEBUG
   54.39  #include <cassert>
   54.40  #endif
   54.41  
   54.42 -namespace yans {
   54.43 +namespace ns3 {
   54.44  
   54.45  template <typename T1>
   54.46  void 
   54.47 @@ -294,6 +294,6 @@
   54.48  }
   54.49  
   54.50  
   54.51 -}; // namespace yans
   54.52 +}; // namespace ns3
   54.53  
   54.54  #endif /* TRACED_VARIABLE_CONTAINER_H */

    55.1 --- a/src/common/trace-stream-test.cc	Tue Aug 29 17:51:31 2006 +0200
    55.2 +++ b/src/common/trace-stream-test.cc	Tue Aug 29 17:55:34 2006 +0200
    55.3 @@ -26,7 +26,7 @@
    55.4  
    55.5  namespace {
    55.6  
    55.7 -class TestTraceStream : public yans::Test {
    55.8 +class TestTraceStream : public ns3::Test {
    55.9  public:
   55.10  	TestTraceStream ();
   55.11  	virtual bool run_tests (void);
   55.12 @@ -42,7 +42,7 @@
   55.13  TestTraceStream::run_tests (void)
   55.14  {
   55.15  	bool ok = true;
   55.16 -	yans::TraceStream trace;
   55.17 +	ns3::TraceStream trace;
   55.18  	//trace.set_stream (&std::cout);
   55.19  	trace << 1;
   55.20  	trace << " X ";
   55.21 @@ -63,6 +63,6 @@
   55.22  }
   55.23  
   55.24  
   55.25 -}; // namespace yans
   55.26 +}; // namespace ns3
   55.27  
   55.28  #endif /* RUN_SELF_TESTS */

    56.1 --- a/src/common/trace-stream.h	Tue Aug 29 17:51:31 2006 +0200
    56.2 +++ b/src/common/trace-stream.h	Tue Aug 29 17:55:34 2006 +0200
    56.3 @@ -23,7 +23,7 @@
    56.4  
    56.5  #include <ostream>
    56.6  
    56.7 -namespace yans {
    56.8 +namespace ns3 {
    56.9  
   56.10  /**
   56.11   * \brief log arbitrary data to std::ostreams
   56.12 @@ -67,7 +67,7 @@
   56.13  	std::ostream *m_os;
   56.14  };
   56.15  
   56.16 -}; // namespace yans
   56.17 +}; // namespace ns3
   56.18  
   56.19  
   56.20  #endif /* TRACE_STREAM_H */

    57.1 --- a/src/common/traced-variable-test.cc	Tue Aug 29 17:51:31 2006 +0200
    57.2 +++ b/src/common/traced-variable-test.cc	Tue Aug 29 17:55:34 2006 +0200
    57.3 @@ -25,7 +25,7 @@
    57.4  #include "ns3/callback.h"
    57.5  
    57.6  
    57.7 -namespace yans {
    57.8 +namespace ns3 {
    57.9  
   57.10  class Foo {
   57.11  public:
   57.12 @@ -247,6 +247,6 @@
   57.13  
   57.14  static TracedVariableTest g_traced_variable_test;
   57.15  
   57.16 -}; // namespace yans
   57.17 +}; // namespace ns3
   57.18  
   57.19  

    58.1 --- a/src/common/ui-traced-variable.tcc	Tue Aug 29 17:51:31 2006 +0200
    58.2 +++ b/src/common/ui-traced-variable.tcc	Tue Aug 29 17:55:34 2006 +0200
    58.3 @@ -25,7 +25,7 @@
    58.4  #include "ns3/callback.h"
    58.5  #include <stdint.h>
    58.6  
    58.7 -namespace yans {
    58.8 +namespace ns3 {
    58.9  
   58.10  class UiTracedVariableBase {
   58.11  public:
   58.12 @@ -69,12 +69,12 @@
   58.13   *
   58.14   * To instantiate a 32-bit unsigned variable (to store
   58.15   * a TCP counter for example), you would create a variable of type
   58.16 - * yans::UiTracedVariable<uint32_t> :
   58.17 + * ns3::UiTracedVariable<uint32_t> :
   58.18   \code
   58.19   #include <stdint.h>
   58.20   #include "ns3/ui-traced-variable.tcc"
   58.21  
   58.22 - yans::UiTracedVariable<uint32_t> var;
   58.23 + ns3::UiTracedVariable<uint32_t> var;
   58.24   \endcode
   58.25   * and you would use it like any other variable of type uint32_t:
   58.26   \code
   58.27 @@ -234,6 +234,6 @@
   58.28  	return lhs;
   58.29  }
   58.30  
   58.31 -}; // namespace yans
   58.32 +}; // namespace ns3
   58.33  
   58.34  #endif /* UI_TRACED_VARIABLE_TCC */

    59.1 --- a/src/common/utils.cc	Tue Aug 29 17:51:31 2006 +0200
    59.2 +++ b/src/common/utils.cc	Tue Aug 29 17:55:34 2006 +0200
    59.3 @@ -21,7 +21,7 @@
    59.4  
    59.5  #include "utils.h"
    59.6  
    59.7 -namespace yans {
    59.8 +namespace ns3 {
    59.9  
   59.10  uint16_t 
   59.11  utils_hton_16 (uint16_t v)
   59.12 @@ -156,12 +156,12 @@
   59.13  }
   59.14  
   59.15  
   59.16 -}; // namespace yans
   59.17 +}; // namespace ns3
   59.18  
   59.19  
   59.20  #ifdef RUN_SELF_TESTS
   59.21  #include "ns3/test.h"
   59.22 -namespace yans {
   59.23 +namespace ns3 {
   59.24  
   59.25  class UtilsTest : public Test {
   59.26  public:
   59.27 @@ -289,5 +289,5 @@
   59.28  	return ok;
   59.29  }
   59.30  static UtilsTest g_utils_test;
   59.31 -}; //namespace yans
   59.32 +}; //namespace ns3
   59.33  #endif /* RUN_SELF_TESTS */

    60.1 --- a/src/common/utils.h	Tue Aug 29 17:51:31 2006 +0200
    60.2 +++ b/src/common/utils.h	Tue Aug 29 17:55:34 2006 +0200
    60.3 @@ -24,7 +24,7 @@
    60.4  
    60.5  #include <stdint.h>
    60.6  
    60.7 -namespace yans {
    60.8 +namespace ns3 {
    60.9  
   60.10  uint16_t utils_hton_16 (uint16_t v);
   60.11  uint32_t utils_hton_32 (uint32_t v);
   60.12 @@ -38,6 +38,6 @@
   60.13  uint16_t utils_checksum_calculate (uint16_t checksum, uint8_t *buffer, uint16_t size);
   60.14  uint16_t utils_checksum_complete (uint16_t checksum);
   60.15  
   60.16 -}; // namespace yans
   60.17 +}; // namespace ns3
   60.18  
   60.19  #endif /* UTILS_H */

    61.1 --- a/src/core/callback-test.cc	Tue Aug 29 17:51:31 2006 +0200
    61.2 +++ b/src/core/callback-test.cc	Tue Aug 29 17:55:34 2006 +0200
    61.3 @@ -25,7 +25,7 @@
    61.4  
    61.5  #ifdef RUN_SELF_TESTS
    61.6  
    61.7 -namespace yans {
    61.8 +namespace ns3 {
    61.9  
   61.10  static bool g_test5 = false;
   61.11  static bool g_test6 = false;
   61.12 @@ -47,7 +47,7 @@
   61.13  	return a;
   61.14  }
   61.15  
   61.16 -class CallbackTest : public yans::Test {
   61.17 +class CallbackTest : public ns3::Test {
   61.18  private:
   61.19  	bool m_test1;
   61.20  	bool m_test2;
   61.21 @@ -66,7 +66,7 @@
   61.22  };
   61.23  
   61.24  CallbackTest::CallbackTest ()
   61.25 -	: yans::Test ("Callback"),
   61.26 +	: ns3::Test ("Callback"),
   61.27  	  m_test1 (false),
   61.28  	  m_test2 (false),
   61.29  	  m_test3 (false),
   61.30 @@ -133,13 +133,13 @@
   61.31  {
   61.32  	bool ok = true;
   61.33  
   61.34 -	typedef yans::Callback<void> A;
   61.35 -	typedef yans::Callback<int> B;
   61.36 -	typedef yans::Callback<void, double> C;
   61.37 -	typedef yans::Callback<int, double, int> D;
   61.38 -	typedef yans::Callback<void> E;
   61.39 -	typedef yans::Callback<void,int> F;
   61.40 -	typedef yans::Callback<int,int> G;
   61.41 +	typedef ns3::Callback<void> A;
   61.42 +	typedef ns3::Callback<int> B;
   61.43 +	typedef ns3::Callback<void, double> C;
   61.44 +	typedef ns3::Callback<int, double, int> D;
   61.45 +	typedef ns3::Callback<void> E;
   61.46 +	typedef ns3::Callback<void,int> F;
   61.47 +	typedef ns3::Callback<int,int> G;
   61.48  	
   61.49  	A a0 (this, &CallbackTest::test1);
   61.50  	B b0;
   61.51 @@ -164,13 +164,13 @@
   61.52  
   61.53  	reset ();
   61.54  
   61.55 -	A a1 = yans::make_callback (&CallbackTest::test1, this);
   61.56 -	B b1 = yans::make_callback (&CallbackTest::test2, this);
   61.57 -	C c1 = yans::make_callback (&CallbackTest::test3, this);
   61.58 -	D d1 = yans::make_callback (&CallbackTest::test4, this);
   61.59 -	E e1 = yans::make_callback (&test5);
   61.60 -	F f1 = yans::make_callback (&test6);
   61.61 -	G g1 = yans::make_callback (&test7);
   61.62 +	A a1 = ns3::make_callback (&CallbackTest::test1, this);
   61.63 +	B b1 = ns3::make_callback (&CallbackTest::test2, this);
   61.64 +	C c1 = ns3::make_callback (&CallbackTest::test3, this);
   61.65 +	D d1 = ns3::make_callback (&CallbackTest::test4, this);
   61.66 +	E e1 = ns3::make_callback (&test5);
   61.67 +	F f1 = ns3::make_callback (&test6);
   61.68 +	G g1 = ns3::make_callback (&test7);
   61.69  	
   61.70  	a1 ();
   61.71  	b1 ();

    62.1 --- a/src/core/callback.h	Tue Aug 29 17:51:31 2006 +0200
    62.2 +++ b/src/core/callback.h	Tue Aug 29 17:55:34 2006 +0200
    62.3 @@ -24,7 +24,7 @@
    62.4  
    62.5  #include "reference-list.h"
    62.6  
    62.7 -namespace yans {
    62.8 +namespace ns3 {
    62.9  
   62.10  /***
   62.11   * \internal
   62.12 @@ -512,7 +512,7 @@
   62.13  }
   62.14  
   62.15  
   62.16 -}; // namespace yans
   62.17 +}; // namespace ns3
   62.18  
   62.19  
   62.20  #endif /* CALLBACK_H */

    63.1 --- a/src/core/exec-commands.h	Tue Aug 29 17:51:31 2006 +0200
    63.2 +++ b/src/core/exec-commands.h	Tue Aug 29 17:55:34 2006 +0200
    63.3 @@ -26,7 +26,7 @@
    63.4  #include <vector>
    63.5  #include "callback.h"
    63.6  
    63.7 -namespace yans {
    63.8 +namespace ns3 {
    63.9  
   63.10  class ExecCommandsPrivate;
   63.11  

    64.1 --- a/src/core/reference-list-test.cc	Tue Aug 29 17:51:31 2006 +0200
    64.2 +++ b/src/core/reference-list-test.cc	Tue Aug 29 17:55:34 2006 +0200
    64.3 @@ -48,20 +48,20 @@
    64.4  	}
    64.5  };
    64.6  
    64.7 -class RefTest : public yans::Test {
    64.8 +class RefTest : public ns3::Test {
    64.9  public:
   64.10  	RefTest ();
   64.11  	virtual bool run_tests (void);
   64.12  private:
   64.13 -	void test (yans::ReferenceList<A *>);
   64.14 +	void test (ns3::ReferenceList<A *>);
   64.15  };
   64.16  
   64.17  RefTest::RefTest ()
   64.18 -	: yans::Test ("ReferenceList")
   64.19 +	: ns3::Test ("ReferenceList")
   64.20  {}
   64.21  
   64.22  void
   64.23 -RefTest::test (yans::ReferenceList<A *> a) 
   64.24 +RefTest::test (ns3::ReferenceList<A *> a) 
   64.25  {
   64.26  	a->trace ();
   64.27  }
   64.28 @@ -72,9 +72,9 @@
   64.29  	bool ok = true;
   64.30  
   64.31  	{
   64.32 -		yans::ReferenceList<A *> tmp;
   64.33 +		ns3::ReferenceList<A *> tmp;
   64.34  		{
   64.35 -			yans::ReferenceList<A *> a (new A ());
   64.36 +			ns3::ReferenceList<A *> a (new A ());
   64.37  			
   64.38  			test (a);
   64.39  			tmp = a;
   64.40 @@ -88,22 +88,22 @@
   64.41  	}
   64.42  
   64.43  	{
   64.44 -		yans::ReferenceList<A *> tmp;
   64.45 +		ns3::ReferenceList<A *> tmp;
   64.46  	}
   64.47  
   64.48  	{
   64.49 -		yans::ReferenceList<A *> tmp (new A ());
   64.50 +		ns3::ReferenceList<A *> tmp (new A ());
   64.51  	}
   64.52  
   64.53  	{
   64.54 -		yans::ReferenceList<A *> tmp;
   64.55 +		ns3::ReferenceList<A *> tmp;
   64.56  		tmp.set (new A ());
   64.57  	}
   64.58  
   64.59  	{
   64.60  		TRACE ("test assignement");
   64.61 -		yans::ReferenceList<A *> a0 (new A ());
   64.62 -		yans::ReferenceList<A *> a1 (new A ());
   64.63 +		ns3::ReferenceList<A *> a0 (new A ());
   64.64 +		ns3::ReferenceList<A *> a1 (new A ());
   64.65  		a0 = a1;
   64.66  	}
   64.67  

    65.1 --- a/src/core/reference-list.h	Tue Aug 29 17:51:31 2006 +0200
    65.2 +++ b/src/core/reference-list.h	Tue Aug 29 17:55:34 2006 +0200
    65.3 @@ -29,7 +29,7 @@
    65.4   */
    65.5  
    65.6  
    65.7 -namespace yans {
    65.8 +namespace ns3 {
    65.9  
   65.10  template <typename OBJ_PTR>
   65.11  class ReferenceList;
   65.12 @@ -112,6 +112,6 @@
   65.13  	mutable ReferenceList const*m_next;
   65.14  };
   65.15  
   65.16 -}; // namespace yans
   65.17 +}; // namespace ns3
   65.18  
   65.19  #endif /* REFERENCE_LIST_H */

    66.1 --- a/src/core/system-file.h	Tue Aug 29 17:51:31 2006 +0200
    66.2 +++ b/src/core/system-file.h	Tue Aug 29 17:55:34 2006 +0200
    66.3 @@ -24,7 +24,7 @@
    66.4  
    66.5  #include <stdint.h>
    66.6  
    66.7 -namespace yans {
    66.8 +namespace ns3 {
    66.9  
   66.10  class SystemFilePrivate;
   66.11  
   66.12 @@ -39,6 +39,6 @@
   66.13  	SystemFilePrivate *m_priv;
   66.14  };
   66.15  
   66.16 -}; //namespace yans
   66.17 +}; //namespace ns3
   66.18  
   66.19  #endif /* SYSTEM_FILE_H */

    67.1 --- a/src/core/system-mutex.h	Tue Aug 29 17:51:31 2006 +0200
    67.2 +++ b/src/core/system-mutex.h	Tue Aug 29 17:55:34 2006 +0200
    67.3 @@ -23,7 +23,7 @@
    67.4  
    67.5  #include <stdint.h>
    67.6  
    67.7 -namespace yans {
    67.8 +namespace ns3 {
    67.9  
   67.10  class SystemMutexPrivate;
   67.11  
   67.12 @@ -37,6 +37,6 @@
   67.13  	SystemMutexPrivate *m_priv;
   67.14  };
   67.15  
   67.16 -}; // namespace yans
   67.17 +}; // namespace ns3
   67.18  
   67.19  #endif /* SYSTEM_MUTEX_H */

    68.1 --- a/src/core/system-semaphore.h	Tue Aug 29 17:51:31 2006 +0200
    68.2 +++ b/src/core/system-semaphore.h	Tue Aug 29 17:55:34 2006 +0200
    68.3 @@ -23,7 +23,7 @@
    68.4  
    68.5  #include <stdint.h>
    68.6  
    68.7 -namespace yans {
    68.8 +namespace ns3 {
    68.9  
   68.10  class SystemSemaphorePrivate;
   68.11  
   68.12 @@ -39,6 +39,6 @@
   68.13  	SystemSemaphorePrivate *m_priv;
   68.14  };
   68.15  
   68.16 -}; // namespace yans
   68.17 +}; // namespace ns3
   68.18  
   68.19  #endif /* SYSTEM_SEMAPHORE_H */

    69.1 --- a/src/core/system-thread.h	Tue Aug 29 17:51:31 2006 +0200
    69.2 +++ b/src/core/system-thread.h	Tue Aug 29 17:55:34 2006 +0200
    69.3 @@ -21,7 +21,7 @@
    69.4  #ifndef SYSTEM_THREAD_H
    69.5  #define SYSTEM_THREAD_H
    69.6  
    69.7 -namespace yans {
    69.8 +namespace ns3 {
    69.9  
   69.10  class SystemThreadPrivate;
   69.11  
   69.12 @@ -35,7 +35,7 @@
   69.13  	virtual void real_run (void) = 0;
   69.14  };
   69.15  
   69.16 -}; // namespace yans
   69.17 +}; // namespace ns3
   69.18  
   69.19  
   69.20  #endif /* SYSTEM_THREAD_H */

    70.1 --- a/src/core/test.cc	Tue Aug 29 17:51:31 2006 +0200
    70.2 +++ b/src/core/test.cc	Tue Aug 29 17:55:34 2006 +0200
    70.3 @@ -24,7 +24,7 @@
    70.4  #ifdef RUN_SELF_TESTS
    70.5  #include <iostream>
    70.6  
    70.7 -namespace yans {
    70.8 +namespace ns3 {
    70.9  
   70.10  TestManager *
   70.11  TestManager::get (void)
   70.12 @@ -102,6 +102,6 @@
   70.13  	return TestManager::failure ();
   70.14  }
   70.15  
   70.16 -}; // namespace yans
   70.17 +}; // namespace ns3
   70.18  
   70.19  #endif /* RUN_SELF_TESTS */

    71.1 --- a/src/core/test.h	Tue Aug 29 17:51:31 2006 +0200
    71.2 +++ b/src/core/test.h	Tue Aug 29 17:55:34 2006 +0200
    71.3 @@ -29,7 +29,7 @@
    71.4  
    71.5  #ifdef RUN_SELF_TESTS
    71.6  
    71.7 -namespace yans {
    71.8 +namespace ns3 {
    71.9  
   71.10  class TestManager;
   71.11  
   71.12 @@ -68,7 +68,7 @@
   71.13  	Tests m_tests;
   71.14  	bool m_verbose;
   71.15  };
   71.16 -}; // namespace yans 
   71.17 +}; // namespace ns3 
   71.18  
   71.19  #endif /* RUN_SELF_TESTS */
   71.20  

    72.1 --- a/src/core/unix-exec-commands.cc	Tue Aug 29 17:51:31 2006 +0200
    72.2 +++ b/src/core/unix-exec-commands.cc	Tue Aug 29 17:55:34 2006 +0200
    72.3 @@ -47,7 +47,7 @@
    72.4  #endif /* TRACE_COMMAND */
    72.5  
    72.6  
    72.7 -namespace yans {
    72.8 +namespace ns3 {
    72.9  
   72.10  class LogThread : public SystemThread {
   72.11  public:
   72.12 @@ -446,7 +446,7 @@
   72.13  	return m_priv->get_size ();
   72.14  }
   72.15  
   72.16 -}; // namespace yans
   72.17 +}; // namespace ns3
   72.18  
   72.19  #ifdef RUN_SELF_TESTS
   72.20  
   72.21 @@ -454,7 +454,7 @@
   72.22  #include <iomanip>
   72.23  #include <iostream>
   72.24  
   72.25 -namespace yans {
   72.26 +namespace ns3 {
   72.27  
   72.28  class ExecCommandsTest: public Test {
   72.29  public:
   72.30 @@ -509,7 +509,7 @@
   72.31  
   72.32  static ExecCommandsTest g_exec_commands_test;
   72.33  
   72.34 -}; // namespace yans
   72.35 +}; // namespace ns3
   72.36  
   72.37  #endif /* RUN_SELF_TESTS */
   72.38  

    73.1 --- a/src/core/unix-system-file.cc	Tue Aug 29 17:51:31 2006 +0200
    73.2 +++ b/src/core/unix-system-file.cc	Tue Aug 29 17:55:34 2006 +0200
    73.3 @@ -42,7 +42,7 @@
    73.4  #define BUFFER_SIZE (4096)
    73.5  
    73.6  
    73.7 -namespace yans {
    73.8 +namespace ns3 {
    73.9  
   73.10  class SystemFilePrivate {
   73.11  public:

    74.1 --- a/src/core/unix-system-mutex.cc	Tue Aug 29 17:51:31 2006 +0200
    74.2 +++ b/src/core/unix-system-mutex.cc	Tue Aug 29 17:55:34 2006 +0200
    74.3 @@ -24,7 +24,7 @@
    74.4  #include <pthread.h>
    74.5  #include <cassert>
    74.6  
    74.7 -namespace yans {
    74.8 +namespace ns3 {
    74.9  
   74.10  class SystemMutexPrivate {
   74.11  public:
   74.12 @@ -79,4 +79,4 @@
   74.13  
   74.14  
   74.15  
   74.16 -}; // namespace yans
   74.17 +}; // namespace ns3

    75.1 --- a/src/core/unix-system-semaphore.cc	Tue Aug 29 17:51:31 2006 +0200
    75.2 +++ b/src/core/unix-system-semaphore.cc	Tue Aug 29 17:55:34 2006 +0200
    75.3 @@ -27,7 +27,7 @@
    75.4  #include "errno.h"
    75.5  #include "string.h"
    75.6  
    75.7 -namespace yans {
    75.8 +namespace ns3 {
    75.9  
   75.10  class SystemSemaphorePrivate {
   75.11  public:
   75.12 @@ -111,4 +111,4 @@
   75.13  
   75.14  
   75.15  
   75.16 -}; // namespace yans
   75.17 +}; // namespace ns3

    76.1 --- a/src/core/unix-system-thread.cc	Tue Aug 29 17:51:31 2006 +0200
    76.2 +++ b/src/core/unix-system-thread.cc	Tue Aug 29 17:55:34 2006 +0200
    76.3 @@ -24,7 +24,7 @@
    76.4  #include <pthread.h>
    76.5  #include <cassert>
    76.6  
    76.7 -namespace yans {
    76.8 +namespace ns3 {
    76.9  
   76.10  class SystemThreadPrivate {
   76.11  public:
   76.12 @@ -65,5 +65,5 @@
   76.13  	delete m_priv;
   76.14  }
   76.15  
   76.16 -}; // namespace yans
   76.17 +}; // namespace ns3
   76.18  

    77.1 --- a/src/core/unix-wall-clock-ms.cc	Tue Aug 29 17:51:31 2006 +0200
    77.2 +++ b/src/core/unix-wall-clock-ms.cc	Tue Aug 29 17:55:34 2006 +0200
    77.3 @@ -22,7 +22,7 @@
    77.4  #include "wall-clock-ms.h"
    77.5  #include <sys/time.h>
    77.6  
    77.7 -namespace yans {
    77.8 +namespace ns3 {
    77.9  
   77.10  class WallClockMsPrivate {
   77.11  public:
   77.12 @@ -71,4 +71,4 @@
   77.13  	return m_priv->end ();
   77.14  }
   77.15  
   77.16 -}; // namespace yans
   77.17 +}; // namespace ns3

    78.1 --- a/src/core/wall-clock-ms.h	Tue Aug 29 17:51:31 2006 +0200
    78.2 +++ b/src/core/wall-clock-ms.h	Tue Aug 29 17:55:34 2006 +0200
    78.3 @@ -22,7 +22,7 @@
    78.4  #ifndef WALL_CLOCK_MS_H
    78.5  #define WALL_CLOCK_MS_H
    78.6  
    78.7 -namespace yans {
    78.8 +namespace ns3 {
    78.9  
   78.10  class WallClockMs {
   78.11  public:
   78.12 @@ -35,6 +35,6 @@
   78.13  	class WallClockMsPrivate *m_priv;
   78.14  };
   78.15  
   78.16 -}; // namespace yans
   78.17 +}; // namespace ns3
   78.18  
   78.19  #endif /* WALL_CLOCK_MS_H */

    79.1 --- a/src/core/win32-system-file.cc	Tue Aug 29 17:51:31 2006 +0200
    79.2 +++ b/src/core/win32-system-file.cc	Tue Aug 29 17:55:34 2006 +0200
    79.3 @@ -34,7 +34,7 @@
    79.4  #define BUFFER_SIZE (4096)
    79.5  
    79.6  
    79.7 -namespace yans {
    79.8 +namespace ns3 {
    79.9  
   79.10  class SystemFilePrivate {
   79.11  public:

    80.1 --- a/src/core/win32-system-mutex.cc	Tue Aug 29 17:51:31 2006 +0200
    80.2 +++ b/src/core/win32-system-mutex.cc	Tue Aug 29 17:55:34 2006 +0200
    80.3 @@ -24,7 +24,7 @@
    80.4  #include <windows.h>
    80.5  #include <cassert>
    80.6  
    80.7 -namespace yans {
    80.8 +namespace ns3 {
    80.9  
   80.10  class SystemMutexPrivate {
   80.11  public:
   80.12 @@ -75,4 +75,4 @@
   80.13  
   80.14  
   80.15  
   80.16 -}; // namespace yans
   80.17 +}; // namespace ns3

    81.1 --- a/src/core/win32-system-semaphore.cc	Tue Aug 29 17:51:31 2006 +0200
    81.2 +++ b/src/core/win32-system-semaphore.cc	Tue Aug 29 17:55:34 2006 +0200
    81.3 @@ -25,7 +25,7 @@
    81.4  #include <cassert>
    81.5  #include <iostream>
    81.6  
    81.7 -namespace yans {
    81.8 +namespace ns3 {
    81.9  
   81.10  class SystemSemaphorePrivate {
   81.11  public:
   81.12 @@ -100,4 +100,4 @@
   81.13  
   81.14  
   81.15  
   81.16 -}; // namespace yans
   81.17 +}; // namespace ns3

    82.1 --- a/src/core/win32-system-thread.cc	Tue Aug 29 17:51:31 2006 +0200
    82.2 +++ b/src/core/win32-system-thread.cc	Tue Aug 29 17:55:34 2006 +0200
    82.3 @@ -23,7 +23,7 @@
    82.4  #include <windows.h>
    82.5  #include <cassert>
    82.6  
    82.7 -namespace yans {
    82.8 +namespace ns3 {
    82.9  
   82.10  class SystemThreadPrivate {
   82.11  public:
   82.12 @@ -62,5 +62,5 @@
   82.13  	delete m_priv;
   82.14  }
   82.15  
   82.16 -}; // namespace yans
   82.17 +}; // namespace ns3
   82.18  

    83.1 --- a/src/core/win32-wall-clock-ms.cc	Tue Aug 29 17:51:31 2006 +0200
    83.2 +++ b/src/core/win32-wall-clock-ms.cc	Tue Aug 29 17:55:34 2006 +0200
    83.3 @@ -21,7 +21,7 @@
    83.4  
    83.5  #include "wall-clock-ms.h"
    83.6  
    83.7 -namespace yans {
    83.8 +namespace ns3 {
    83.9  
   83.10  class WallClockMsPrivate {
   83.11  public:
   83.12 @@ -62,4 +62,4 @@
   83.13  	return m_priv->end ();
   83.14  }
   83.15  
   83.16 -}; // namespace yans
   83.17 +}; // namespace ns3

    84.1 --- a/src/simulator/event-impl.cc	Tue Aug 29 17:51:31 2006 +0200
    84.2 +++ b/src/simulator/event-impl.cc	Tue Aug 29 17:55:34 2006 +0200
    84.3 @@ -22,7 +22,7 @@
    84.4  #include "event-impl.h"
    84.5  
    84.6  
    84.7 -namespace yans {
    84.8 +namespace ns3 {
    84.9  
   84.10  
   84.11  EventImpl::~EventImpl ()
   84.12 @@ -64,4 +64,4 @@
   84.13  	return (m_running == 1);
   84.14  }
   84.15  
   84.16 -}; // namespace yans
   84.17 +}; // namespace ns3

    85.1 --- a/src/simulator/event-impl.h	Tue Aug 29 17:51:31 2006 +0200
    85.2 +++ b/src/simulator/event-impl.h	Tue Aug 29 17:55:34 2006 +0200
    85.3 @@ -23,7 +23,7 @@
    85.4  
    85.5  #include <stdint.h>
    85.6  
    85.7 -namespace yans {
    85.8 +namespace ns3 {
    85.9  
   85.10  class EventImpl {
   85.11  public:
   85.12 @@ -44,6 +44,6 @@
   85.13  	uint32_t m_running : 1;
   85.14  };
   85.15  
   85.16 -}; // namespace yans
   85.17 +}; // namespace ns3
   85.18  
   85.19  #endif /* EVENT_IMPL_H */

    86.1 --- a/src/simulator/event-tcc-test.cc	Tue Aug 29 17:51:31 2006 +0200
    86.2 +++ b/src/simulator/event-tcc-test.cc	Tue Aug 29 17:55:34 2006 +0200
    86.3 @@ -66,7 +66,7 @@
    86.4  
    86.5  };
    86.6  
    86.7 -namespace yans {
    86.8 +namespace ns3 {
    86.9  class EventTest : public Test {
   86.10  public:
   86.11  	EventTest ();
   86.12 @@ -82,17 +82,17 @@
   86.13  {
   86.14  	Event ev;
   86.15  
   86.16 -	ev = yans::make_event (&null_cb);
   86.17 +	ev = ns3::make_event (&null_cb);
   86.18  	ev ();
   86.19 -	ev = yans::make_event (&one_cb, 1);
   86.20 +	ev = ns3::make_event (&one_cb, 1);
   86.21  	ev ();
   86.22 -	ev = yans::make_event (&two_cb, 1, 2);
   86.23 +	ev = ns3::make_event (&two_cb, 1, 2);
   86.24  	ev ();
   86.25 -	ev = yans::make_event (&three_cb, 1, 2, 3);
   86.26 +	ev = ns3::make_event (&three_cb, 1, 2, 3);
   86.27  	ev ();
   86.28 -	ev = yans::make_event (&four_cb, 1, 2, 3, 4);
   86.29 +	ev = ns3::make_event (&four_cb, 1, 2, 3, 4);
   86.30  	ev ();
   86.31 -	ev = yans::make_event (&five_cb, 1, 2, 3, 4, 5);
   86.32 +	ev = ns3::make_event (&five_cb, 1, 2, 3, 4, 5);
   86.33  	ev ();
   86.34  
   86.35  	if (g_error) {

    87.1 --- a/src/simulator/event-tcc.cc	Tue Aug 29 17:51:31 2006 +0200
    87.2 +++ b/src/simulator/event-tcc.cc	Tue Aug 29 17:55:34 2006 +0200
    87.3 @@ -21,7 +21,7 @@
    87.4  #include "event-impl.h"
    87.5  #include "event.h"
    87.6  
    87.7 -namespace yans {
    87.8 +namespace ns3 {
    87.9  
   87.10  class EventFunctionImpl0 : public EventImpl {
   87.11  public:
   87.12 @@ -44,4 +44,4 @@
   87.13  	return Event (new EventFunctionImpl0 (f));
   87.14  }
   87.15  
   87.16 -}; // namespace yans
   87.17 +}; // namespace ns3

    88.1 --- a/src/simulator/event.h	Tue Aug 29 17:51:31 2006 +0200
    88.2 +++ b/src/simulator/event.h	Tue Aug 29 17:55:34 2006 +0200
    88.3 @@ -25,7 +25,7 @@
    88.4  #include <algorithm>
    88.5  #include "event-impl.h"
    88.6  
    88.7 -namespace yans {
    88.8 +namespace ns3 {
    88.9  
   88.10  
   88.11  class EventImpl;
   88.12 @@ -135,6 +135,6 @@
   88.13  	EventImpl *m_impl;
   88.14  };
   88.15  
   88.16 -}; // namespace yans
   88.17 +}; // namespace ns3
   88.18  
   88.19  #endif /* EVENT_H */

    89.1 --- a/src/simulator/event.tcc	Tue Aug 29 17:51:31 2006 +0200
    89.2 +++ b/src/simulator/event.tcc	Tue Aug 29 17:55:34 2006 +0200
    89.3 @@ -26,9 +26,9 @@
    89.4  #include "event-impl.h"
    89.5  
    89.6  /**
    89.7 - * yans namespace
    89.8 + * ns3 namespace
    89.9   */
   89.10 -namespace yans {
   89.11 +namespace ns3 {
   89.12  
   89.13  /**
   89.14   * \defgroup make_event make_event
   89.15 @@ -449,6 +449,6 @@
   89.16  }
   89.17  
   89.18  
   89.19 -}; // namespace yans
   89.20 +}; // namespace ns3
   89.21  
   89.22  #endif /* EVENT_TCC */

    90.1 --- a/src/simulator/scheduler-heap.cc	Tue Aug 29 17:51:31 2006 +0200
    90.2 +++ b/src/simulator/scheduler-heap.cc	Tue Aug 29 17:55:34 2006 +0200
    90.3 @@ -49,7 +49,7 @@
    90.4  
    90.5  
    90.6  
    90.7 -namespace yans {
    90.8 +namespace ns3 {
    90.9  
   90.10  SchedulerHeap::SchedulerHeap ()
   90.11  {
   90.12 @@ -240,4 +240,4 @@
   90.13  	return key;
   90.14  }
   90.15  
   90.16 -}; // namespace yans
   90.17 +}; // namespace ns3

    91.1 --- a/src/simulator/scheduler-heap.h	Tue Aug 29 17:51:31 2006 +0200
    91.2 +++ b/src/simulator/scheduler-heap.h	Tue Aug 29 17:55:34 2006 +0200
    91.3 @@ -26,7 +26,7 @@
    91.4  #include <stdint.h>
    91.5  #include <vector>
    91.6  
    91.7 -namespace yans {
    91.8 +namespace ns3 {
    91.9  
   91.10  class Event;
   91.11  class EventHolder;
   91.12 @@ -65,7 +65,7 @@
   91.13  	BinaryHeap m_heap;
   91.14  };
   91.15  
   91.16 -}; // namespace yans
   91.17 +}; // namespace ns3
   91.18  
   91.19  
   91.20  #endif /* SCHEDULER_HEAP_H */

    92.1 --- a/src/simulator/scheduler-list.cc	Tue Aug 29 17:51:31 2006 +0200
    92.2 +++ b/src/simulator/scheduler-list.cc	Tue Aug 29 17:55:34 2006 +0200
    92.3 @@ -24,7 +24,7 @@
    92.4  #include <utility>
    92.5  #include <cassert>
    92.6  
    92.7 -namespace yans {
    92.8 +namespace ns3 {
    92.9  
   92.10  SchedulerList::SchedulerList ()
   92.11  {}
   92.12 @@ -104,4 +104,4 @@
   92.13  	return key;
   92.14  }
   92.15  
   92.16 -}; // namespace yans
   92.17 +}; // namespace ns3

    93.1 --- a/src/simulator/scheduler-list.h	Tue Aug 29 17:51:31 2006 +0200
    93.2 +++ b/src/simulator/scheduler-list.h	Tue Aug 29 17:55:34 2006 +0200
    93.3 @@ -27,7 +27,7 @@
    93.4  #include <utility>
    93.5  #include <stdint.h>
    93.6  
    93.7 -namespace yans {
    93.8 +namespace ns3 {
    93.9  
   93.10  class Event;
   93.11  
   93.12 @@ -51,7 +51,7 @@
   93.13  	Events m_events;
   93.14  };
   93.15  
   93.16 -}; // namespace yans
   93.17 +}; // namespace ns3
   93.18  
   93.19  
   93.20  #endif /* SCHEDULER_LIST_H */

    94.1 --- a/src/simulator/scheduler-map.cc	Tue Aug 29 17:51:31 2006 +0200
    94.2 +++ b/src/simulator/scheduler-map.cc	Tue Aug 29 17:55:34 2006 +0200
    94.3 @@ -35,7 +35,7 @@
    94.4  #endif /* TRACE_MAP */
    94.5  
    94.6  
    94.7 -namespace yans {
    94.8 +namespace ns3 {
    94.9  
   94.10  
   94.11  SchedulerMap::SchedulerMap ()
   94.12 @@ -109,4 +109,4 @@
   94.13  }
   94.14  
   94.15  
   94.16 -}; // namespace yans
   94.17 +}; // namespace ns3

    95.1 --- a/src/simulator/scheduler-map.h	Tue Aug 29 17:51:31 2006 +0200
    95.2 +++ b/src/simulator/scheduler-map.h	Tue Aug 29 17:55:34 2006 +0200
    95.3 @@ -27,7 +27,7 @@
    95.4  #include <map>
    95.5  #include <utility>
    95.6  
    95.7 -namespace yans {
    95.8 +namespace ns3 {
    95.9  
   95.10  class SchedulerMap : public Scheduler {
   95.11  public:
   95.12 @@ -53,7 +53,7 @@
   95.13  	uint32_t m_uid;
   95.14  };
   95.15  
   95.16 -}; // namespace yans
   95.17 +}; // namespace ns3
   95.18  
   95.19  
   95.20  #endif /* SCHEDULER_MAP_H */

    96.1 --- a/src/simulator/scheduler.cc	Tue Aug 29 17:51:31 2006 +0200
    96.2 +++ b/src/simulator/scheduler.cc	Tue Aug 29 17:55:34 2006 +0200
    96.3 @@ -23,7 +23,7 @@
    96.4  #include <cassert>
    96.5  
    96.6  
    96.7 -yans::Scheduler::~Scheduler () 
    96.8 +ns3::Scheduler::~Scheduler () 
    96.9  {}
   96.10  
   96.11  /* Note the invariants which this function must provide:
   96.12 @@ -32,7 +32,7 @@
   96.13   * - transitivity: f(x,y) and f(y,z) => f(x,z)
   96.14   */
   96.15  bool
   96.16 -yans::Scheduler::EventKeyCompare::operator () (struct EventKey a, struct EventKey b)
   96.17 +ns3::Scheduler::EventKeyCompare::operator () (struct EventKey a, struct EventKey b)
   96.18  {
   96.19  	assert (a.m_uid != b.m_uid);
   96.20  	if (a.m_time < b.m_time) {

    97.1 --- a/src/simulator/scheduler.h	Tue Aug 29 17:51:31 2006 +0200
    97.2 +++ b/src/simulator/scheduler.h	Tue Aug 29 17:55:34 2006 +0200
    97.3 @@ -25,7 +25,7 @@
    97.4  #include <stdint.h>
    97.5  #include "event.h"
    97.6  
    97.7 -namespace yans {
    97.8 +namespace ns3 {
    97.9  
   97.10  class Scheduler {
   97.11   public:
   97.12 @@ -48,7 +48,7 @@
   97.13  
   97.14  };
   97.15  
   97.16 -}; // namespace yans
   97.17 +}; // namespace ns3
   97.18  
   97.19  
   97.20  #endif /* SCHEDULER_H */

    98.1 --- a/src/simulator/simulator.cc	Tue Aug 29 17:51:31 2006 +0200
    98.2 +++ b/src/simulator/simulator.cc	Tue Aug 29 17:55:34 2006 +0200
    98.3 @@ -46,7 +46,7 @@
    98.4  #endif /* TRACE_SIMU */
    98.5  
    98.6  
    98.7 -namespace yans {
    98.8 +namespace ns3 {
    98.9  
   98.10  class ParallelSimulatorQueuePrivate {
   98.11  public:
   98.12 @@ -362,7 +362,7 @@
   98.13  }
   98.14  
   98.15  
   98.16 -}; // namespace yans
   98.17 +}; // namespace ns3
   98.18  
   98.19  
   98.20  #include "scheduler-list.h"
   98.21 @@ -370,7 +370,7 @@
   98.22  #include "scheduler-map.h"
   98.23  
   98.24  
   98.25 -namespace yans {
   98.26 +namespace ns3 {
   98.27  
   98.28  SimulatorPrivate *Simulator::m_priv = 0;
   98.29  Simulator::ListType Simulator::m_list_type = LINKED_LIST;
   98.30 @@ -520,10 +520,10 @@
   98.31  	return get_priv ()->remove (ev);
   98.32  }
   98.33  
   98.34 -}; // namespace yans
   98.35 +}; // namespace ns3
   98.36  
   98.37  
   98.38 -namespace yans {
   98.39 +namespace ns3 {
   98.40  
   98.41  ParallelSimulatorQueue::ParallelSimulatorQueue ()
   98.42  {}

    99.1 --- a/src/simulator/simulator.h	Tue Aug 29 17:51:31 2006 +0200
    99.2 +++ b/src/simulator/simulator.h	Tue Aug 29 17:55:34 2006 +0200
    99.3 @@ -25,7 +25,7 @@
    99.4  #include <stdint.h>
    99.5  #include "event.h"
    99.6  
    99.7 -namespace yans {
    99.8 +namespace ns3 {
    99.9  
   99.10  class SimulatorPrivate;
   99.11  class ParallelSimulatorQueuePrivate;
   99.12 @@ -226,6 +226,6 @@
   99.13  	} m_list_type;
   99.14  };
   99.15  
   99.16 -}; // namespace yans
   99.17 +}; // namespace ns3
   99.18  
   99.19  #endif /* SIMULATOR_H */

   100.1 --- a/utils/bench-packets.cc	Tue Aug 29 17:51:31 2006 +0200
   100.2 +++ b/utils/bench-packets.cc	Tue Aug 29 17:55:34 2006 +0200
   100.3 @@ -25,7 +25,7 @@
   100.4  #include "ns3/chunk-ipv4.h"
   100.5  #include <iostream>
   100.6  
   100.7 -using namespace yans;
   100.8 +using namespace ns3;
   100.9  
  100.10  static void 
  100.11  bench_ptr_a (uint32_t n)

   101.1 --- a/utils/bench-simulator.cc	Tue Aug 29 17:51:31 2006 +0200
   101.2 +++ b/utils/bench-simulator.cc	Tue Aug 29 17:55:34 2006 +0200
   101.3 @@ -27,7 +27,7 @@
   101.4  #include <fstream>
   101.5  #include <vector>
   101.6  
   101.7 -using namespace yans;
   101.8 +using namespace ns3;
   101.9  
  101.10  
  101.11  bool g_debug = false;

   102.1 --- a/utils/replay-simulation.cc	Tue Aug 29 17:51:31 2006 +0200
   102.2 +++ b/utils/replay-simulation.cc	Tue Aug 29 17:55:34 2006 +0200
   102.3 @@ -28,7 +28,7 @@
   102.4  #include <fstream>
   102.5  #include <iostream>
   102.6  
   102.7 -using namespace yans;
   102.8 +using namespace ns3;
   102.9  
  102.10  class LogReader {
  102.11  public:

   103.1 --- a/utils/run-tests.cc	Tue Aug 29 17:51:31 2006 +0200
   103.2 +++ b/utils/run-tests.cc	Tue Aug 29 17:55:34 2006 +0200
   103.3 @@ -24,8 +24,8 @@
   103.4  int main (int argc, char *argv[])
   103.5  {
   103.6  #ifdef RUN_SELF_TESTS
   103.7 -	yans::TestManager::enable_verbose ();
   103.8 -	yans::TestManager::run_tests ();
   103.9 +	ns3::TestManager::enable_verbose ();
  103.10 +	ns3::TestManager::run_tests ();
  103.11  #endif /* RUN_SELF_TESTS */
  103.12  
  103.13  	return 0;