# HG changeset patch
# User Kirill Andreev <andreev@iitp.ru>
# Date 1248266623 -14400
# Node ID aee541a30256ed89ed86536e9a1e01bc502200b3
# Parent  0fc1bad6a4ab7e2dcd9056e29ff92ce8118c93de
Restored newline at namespace

diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/airtime-metric.cc
--- a/src/devices/mesh/dot11s/airtime-metric.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/airtime-metric.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -21,10 +21,8 @@
 #include "airtime-metric.h"
 #include "ns3/wifi-remote-station-manager.h"
 #include "ns3/wifi-mode.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator);
 TypeId
 AirtimeLinkMetricCalculator::GetTypeId ()
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/airtime-metric.h
--- a/src/devices/mesh/dot11s/airtime-metric.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/airtime-metric.h	Wed Jul 22 16:43:43 2009 +0400
@@ -21,10 +21,8 @@
 #ifndef AIRTIME_METRIC_H
 #define AIRTIME_METRIC_H
 #include "ns3/mesh-wifi-interface-mac.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/dot11s-installer.cc
--- a/src/devices/mesh/dot11s/dot11s-installer.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/dot11s-installer.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -22,8 +22,7 @@
 #include "peer-management-protocol.h"
 #include "hwmp-protocol.h"
 
-namespace ns3
-{
+namespace ns3 {
 using namespace dot11s;
 NS_OBJECT_ENSURE_REGISTERED (Dot11sStack);
 TypeId
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/dot11s-mac-header.cc
--- a/src/devices/mesh/dot11s/dot11s-mac-header.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/dot11s-mac-header.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/packet.h"
 #include "ns3/test.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /***********************************************************
  *  Here Mesh Mac Header functionality is defined.
  ***********************************************************/
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-protocol-mac.cc
--- a/src/devices/mesh/dot11s/hwmp-protocol-mac.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol-mac.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -31,10 +31,8 @@
 #include "ie-dot11s-prep.h"
 #include "ie-dot11s-rann.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 NS_LOG_COMPONENT_DEFINE ("HwmpProtocolMac");
 HwmpProtocolMac::HwmpProtocolMac (uint32_t ifIndex, Ptr<HwmpProtocol> protocol) :
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-protocol-mac.h
--- a/src/devices/mesh/dot11s/hwmp-protocol-mac.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol-mac.h	Wed Jul 22 16:43:43 2009 +0400
@@ -25,13 +25,11 @@
 #include "ie-dot11s-preq.h"
 #include "ie-dot11s-perr.h"
 
-namespace ns3
-{
+namespace ns3 {
 
 class MeshWifiInterfaceMac;
 
-namespace dot11s
-{
+namespace dot11s {
 
 class HwmpProtocol;
 class WifiMeshActionHeader;
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-protocol.cc
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -36,10 +36,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("HwmpProtocol");
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol);
 TypeId
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-protocol.h
--- a/src/devices/mesh/dot11s/hwmp-protocol.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.h	Wed Jul 22 16:43:43 2009 +0400
@@ -28,13 +28,11 @@
 #include <vector>
 #include <map>
 
-namespace ns3
-{
+namespace ns3 {
 class MeshPointDevice;
 class Packet;
 class Mac48Address;
-namespace dot11s
-{
+namespace dot11s {
 class HwmpProtocolMac;
 class HwmpRtable;
 class IePreq;
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-rtable.cc
--- a/src/devices/mesh/dot11s/hwmp-rtable.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-rtable.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -26,10 +26,8 @@
 
 #include "hwmp-rtable.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 NS_LOG_COMPONENT_DEFINE ("HwmpRtable");
 
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-rtable.h
--- a/src/devices/mesh/dot11s/hwmp-rtable.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-rtable.h	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 #include "ns3/nstime.h"
 #include "ns3/mac48-address.h"
 #include "ie-dot11s-perr.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-tag.cc
--- a/src/devices/mesh/dot11s/hwmp-tag.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-tag.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -20,10 +20,8 @@
 
 #include "hwmp-tag.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 NS_OBJECT_ENSURE_REGISTERED (HwmpTag);
 //Class HwmpTag:
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/hwmp-tag.h
--- a/src/devices/mesh/dot11s/hwmp-tag.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-tag.h	Wed Jul 22 16:43:43 2009 +0400
@@ -26,10 +26,8 @@
 #include "ns3/tag.h"
 #include "ns3/object.h"
 #include "ns3/mac48-address.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("IeBeaconTiming");
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /*******************************************
  * IeBeaconTimingUnit
  *******************************************/
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-beacon-timing.h
--- a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.h	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 #include "ns3/nstime.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  * \brief Describes one unit of beacon timing element
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-configuration.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-configuration.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-configuration.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -22,10 +22,8 @@
 #include "ie-dot11s-configuration.h"
 #include "ns3/test.h"
 #include "ns3/packet.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 dot11sMeshCapability::dot11sMeshCapability () :
   acceptPeerLinks (true), MCCASupported (false), MCCAEnabled (false), forwarding (true), beaconTimingReport (
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-id.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-id.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-id.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -21,10 +21,8 @@
 #include "ie-dot11s-id.h"
 #include "ns3/assert.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 IeMeshId::IeMeshId ()
 {
   for (uint8_t i = 0; i < 32; i++)
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-id.h
--- a/src/devices/mesh/dot11s/ie-dot11s-id.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-id.h	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 #include "ns3/buffer.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \brief a IEEE 802.11s Mesh ID 7.3.287 of 802.11s draft 3.0
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-metric-report.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -21,10 +21,8 @@
 #include "ie-dot11s-metric-report.h"
 #include "ns3/assert.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 IeLinkMetricReport::IeLinkMetricReport () :
   m_metric (0)
 {
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-metric-report.h
--- a/src/devices/mesh/dot11s/ie-dot11s-metric-report.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-metric-report.h	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 #include "ns3/buffer.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \brief a IEEE 802.11s Mesh ID 7.3.2.88 of 802.11s draft 3.0
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-peer-management.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/test.h"
 #include "ns3/packet.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 IePeerManagement::IePeerManagement () :
   m_length (0), m_subtype (PEER_OPEN), m_localLinkId (0), m_peerLinkId (0), m_reasonCode (REASON11S_RESERVED)
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-peer-management.h
--- a/src/devices/mesh/dot11s/ie-dot11s-peer-management.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-peer-management.h	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 /**
  * \ingroup dot11s
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-peering-protocol.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-peering-protocol.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-peering-protocol.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -19,10 +19,8 @@
  */
 
 #include "ie-dot11s-peering-protocol.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 uint8_t
 IePeeringProtocol::GetInformationSize () const
 {
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-perr.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-perr.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-perr.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -23,10 +23,8 @@
 #include "ns3/node.h"
 #include "ns3/packet.h"
 #include "ns3/test.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 IePerr::IePerr ()
 {
 }
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-perr.h
--- a/src/devices/mesh/dot11s/ie-dot11s-perr.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-perr.h	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/mac48-address.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  * \brief See 7.3.2.98 of 802.11s draft 2.07
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-prep.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-prep.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-prep.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/assert.h"
 #include "ns3/test.h"
 #include "ns3/packet.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /********************************
  * IePrep
  *******************************/
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-prep.h
--- a/src/devices/mesh/dot11s/ie-dot11s-prep.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-prep.h	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/mac48-address.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  * \brief See 7.3.2.97 of 802.11s draft 2.07
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-preq.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-preq.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-preq.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 #include "ns3/test.h"
 #include "ns3/packet.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /*************************
  * DestinationAddressUnit
  ************************/
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-preq.h
--- a/src/devices/mesh/dot11s/ie-dot11s-preq.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-preq.h	Wed Jul 22 16:43:43 2009 +0400
@@ -26,10 +26,8 @@
 #include "ns3/mac48-address.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  * \brief Describes an address unit in PREQ information element
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-rann.cc
--- a/src/devices/mesh/dot11s/ie-dot11s-rann.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-rann.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -25,10 +25,8 @@
 #include "ns3/packet.h"
 #include "ns3/test.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 IeRann::~IeRann ()
 {
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/ie-dot11s-rann.h
--- a/src/devices/mesh/dot11s/ie-dot11s-rann.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-rann.h	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/mac48-address.h"
 #include "ns3/wifi-information-element.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  * \brief See 7.3.2.95 of 802.11s draft 2.07
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-link-frame.cc
--- a/src/devices/mesh/dot11s/peer-link-frame.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-link-frame.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/test.h"
 #include "ns3/packet.h"
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart);
 
 PeerLinkFrameStart::PeerLinkFrameStart () :
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-link.cc
--- a/src/devices/mesh/dot11s/peer-link.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-link.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -27,10 +27,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("Dot11sPeerManagementProtocol");
 
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 
 NS_OBJECT_ENSURE_REGISTERED( PeerLink);
 
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-link.h
--- a/src/devices/mesh/dot11s/peer-link.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-link.h	Wed Jul 22 16:43:43 2009 +0400
@@ -30,10 +30,8 @@
 #include "ie-dot11s-peer-management.h"
 #include "ie-dot11s-configuration.h"
 #include "peer-management-protocol-mac.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /**
  * \ingroup dot11s
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-management-protocol-mac.cc
--- a/src/devices/mesh/dot11s/peer-management-protocol-mac.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol-mac.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -27,10 +27,8 @@
 #include "ns3/mesh-wifi-interface-mac.h"
 #include "ns3/simulator.h"
 #include "ns3/wifi-mac-header.h"
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 PeerManagementProtocolMac::PeerManagementProtocolMac (uint32_t interface,
     Ptr<PeerManagementProtocol> protocol)
 {
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-management-protocol-mac.h
--- a/src/devices/mesh/dot11s/peer-management-protocol-mac.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol-mac.h	Wed Jul 22 16:43:43 2009 +0400
@@ -23,11 +23,9 @@
 
 #include "ns3/mesh-wifi-interface-mac-plugin.h"
 
-namespace ns3
-{
+namespace ns3 {
 class MeshWifiInterfaceMac;
-namespace dot11s
-{
+namespace dot11s {
 class PeerManagementProtocol;
 class IeConfiguration;
 class IePeerManagement;
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-management-protocol.cc
--- a/src/devices/mesh/dot11s/peer-management-protocol.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -35,10 +35,8 @@
 #include "peer-link.h"
 
 NS_LOG_COMPONENT_DEFINE ("PeerManagementProtocol");
-namespace ns3
-{
-namespace dot11s
-{
+namespace ns3 {
+namespace dot11s {
 /***************************************************
  * PeerManager
  ***************************************************/
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/dot11s/peer-management-protocol.h
--- a/src/devices/mesh/dot11s/peer-management-protocol.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol.h	Wed Jul 22 16:43:43 2009 +0400
@@ -32,11 +32,9 @@
 #include "peer-link.h"
 
 #include <map>
-namespace ns3
-{
+namespace ns3 {
 class MeshPointDevice;
-namespace dot11s
-{
+namespace dot11s {
 class PeerManagementProtocolMac;
 class PeerLink;
 class IePeerManagement;
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-header.cc
--- a/src/devices/mesh/flame/flame-header.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-header.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 
 #include "flame-header.h"
 
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 FlameHeader::FlameHeader () :
   m_cost (0), m_seqno (0), m_origDst (Mac48Address ()), m_origSrc (Mac48Address ())
 {
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-header.h
--- a/src/devices/mesh/flame/flame-header.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-header.h	Wed Jul 22 16:43:43 2009 +0400
@@ -24,10 +24,8 @@
 #include "ns3/header.h"
 #include "ns3/mac48-address.h"
 
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 /**
  * \ingroup flame
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-installer.h
--- a/src/devices/mesh/flame/flame-installer.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-installer.h	Wed Jul 22 16:43:43 2009 +0400
@@ -21,8 +21,7 @@
 #ifndef FLAME_STACK_INSTALLER_H
 #define FLAME_STACK_INSTALLER_H
 #include "ns3/mesh-stack-installer.h"
-namespace ns3
-{
+namespace ns3 {
 /**
  * \ingroup flame
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-protocol-mac.cc
--- a/src/devices/mesh/flame/flame-protocol-mac.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol-mac.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -22,10 +22,8 @@
 #include "flame-protocol.h"
 #include "flame-header.h"
 #include "ns3/log.h"
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 NS_LOG_COMPONENT_DEFINE ("FlameProtocolMac");
 FlameProtocolMac::FlameProtocolMac (uint32_t ifIndex, Ptr<FlameProtocol> protocol) :
   m_protocol (protocol), m_ifIndex (ifIndex)
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-protocol-mac.h
--- a/src/devices/mesh/flame/flame-protocol-mac.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol-mac.h	Wed Jul 22 16:43:43 2009 +0400
@@ -23,10 +23,8 @@
 
 #include "ns3/mesh-wifi-interface-mac.h"
 
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 class FlameProtocol;
 /**
  * \ingroup flame
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-protocol.cc
--- a/src/devices/mesh/flame/flame-protocol.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -32,10 +32,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("FlameProtocol");
 
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 //-----------------------------------------------------------------------------
 // FlameTag
 //-----------------------------------------------------------------------------
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-protocol.h
--- a/src/devices/mesh/flame/flame-protocol.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol.h	Wed Jul 22 16:43:43 2009 +0400
@@ -44,10 +44,8 @@
  * see also Linux kernel mailing list discussion at
  * http://lkml.org/lkml/2006/5/23/82
  */
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 /**
  * \ingroup flame
  * \brief Transmitter and receiver addresses
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-rtable.cc
--- a/src/devices/mesh/flame/flame-rtable.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-rtable.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -23,10 +23,8 @@
 #include "ns3/log.h"
 
 #include "flame-rtable.h"
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 
 NS_LOG_COMPONENT_DEFINE ("FlameRtable");
 
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/flame/flame-rtable.h
--- a/src/devices/mesh/flame/flame-rtable.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/flame/flame-rtable.h	Wed Jul 22 16:43:43 2009 +0400
@@ -26,10 +26,8 @@
 #include "ns3/object.h"
 #include "ns3/mac48-address.h"
 
-namespace ns3
-{
-namespace flame
-{
+namespace ns3 {
+namespace flame {
 /**
  * \ingroup flame
  *
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-l2-routing-protocol.cc
--- a/src/devices/mesh/mesh-l2-routing-protocol.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-l2-routing-protocol.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -25,8 +25,7 @@
 
 NS_LOG_COMPONENT_DEFINE ("MeshL2RoutingProtocol");
 
-namespace ns3
-{
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol);
 
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-l2-routing-protocol.h
--- a/src/devices/mesh/mesh-l2-routing-protocol.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-l2-routing-protocol.h	Wed Jul 22 16:43:43 2009 +0400
@@ -26,8 +26,7 @@
 #include "ns3/mac48-address.h"
 #include "ns3/packet.h"
 
-namespace ns3
-{
+namespace ns3 {
 
 class Packet;
 class MeshPointDevice;
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-point-device.cc
--- a/src/devices/mesh/mesh-point-device.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-point-device.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -29,8 +29,7 @@
 
 NS_LOG_COMPONENT_DEFINE ("MeshPointDevice");
 
-namespace ns3
-{
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice);
 
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-point-device.h
--- a/src/devices/mesh/mesh-point-device.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-point-device.h	Wed Jul 22 16:43:43 2009 +0400
@@ -27,8 +27,7 @@
 #include "ns3/bridge-channel.h"
 #include "ns3/mesh-l2-routing-protocol.h"
 
-namespace ns3
-{
+namespace ns3 {
 
 class Node;
 /**
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-wifi-beacon.cc
--- a/src/devices/mesh/mesh-wifi-beacon.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-beacon.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -21,8 +21,7 @@
 #include "ns3/mesh-wifi-beacon.h"
 #include <algorithm>
 
-namespace ns3
-{
+namespace ns3 {
 
 MeshWifiBeacon::MeshWifiBeacon (Ssid ssid, SupportedRates rates, uint64_t us)
 {
@@ -35,8 +34,7 @@
 {
   m_elements.push_back (ie);
 }
-namespace
-{
+namespace {
 /// aux sorter for Ptr<WifiInformationElement>
 struct PIEComparator
 {
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-wifi-interface-mac.cc
--- a/src/devices/mesh/mesh-wifi-interface-mac.cc	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-interface-mac.cc	Wed Jul 22 16:43:43 2009 +0400
@@ -35,8 +35,7 @@
 
 NS_LOG_COMPONENT_DEFINE ("MeshWifiInterfaceMac");
 
-namespace ns3
-{
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac);
 
diff -r 0fc1bad6a4ab -r aee541a30256 src/devices/mesh/mesh-wifi-interface-mac.h
--- a/src/devices/mesh/mesh-wifi-interface-mac.h	Wed Jul 22 16:13:32 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-interface-mac.h	Wed Jul 22 16:43:43 2009 +0400
@@ -34,8 +34,7 @@
 #include "ns3/mesh-wifi-interface-mac-plugin.h"
 #include "ns3/event-id.h"
 #include "qos-utils.h"
-namespace ns3
-{
+namespace ns3 {
 
 class WifiMacHeader;
 class DcaTxop;