From c69d48f007d2521fdbea52a0a7a95cfc4a547174 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Mon, 3 Jan 2011 14:35:43 -0800
Subject: Make commenting on close namespace brackets consistent.

Ran all the source files through 'perl -pi' with this script:

s|\s*(};?\s*)?/\*\s*(end\s*)?namespace\s*(\S+)\s*\*/(\s*})?|} // namespace $3|;
s|\s*};?\s*//\s*(end\s*)?namespace\s*(\S+)\s*|} // namespace $2\n|;
s|\s*};?\s*//\s*(\S+)\s*namespace\s*|} // namespace $1\n|;

Also did a little manual editing on some of the arch/*/isa_traits.hh files
and src/SConscript.
---
 src/dev/copy_engine_defs.hh | 2 +-
 src/dev/i8254xGBe_defs.hh   | 2 +-
 src/dev/sinic.cc            | 2 +-
 src/dev/sinic.hh            | 2 +-
 src/dev/sinicreg.hh         | 4 ++--
 src/dev/x86/cmos.hh         | 2 +-
 src/dev/x86/i8042.hh        | 2 +-
 src/dev/x86/i82094aa.hh     | 2 +-
 src/dev/x86/i8237.hh        | 2 +-
 src/dev/x86/i8254.hh        | 2 +-
 src/dev/x86/i8259.hh        | 2 +-
 src/dev/x86/intdev.hh       | 2 +-
 src/dev/x86/speaker.hh      | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/dev')

diff --git a/src/dev/copy_engine_defs.hh b/src/dev/copy_engine_defs.hh
index 16bf57d58..98216e64c 100644
--- a/src/dev/copy_engine_defs.hh
+++ b/src/dev/copy_engine_defs.hh
@@ -220,6 +220,6 @@ struct ChanRegs {
 
 };
 
-} //namespace CopyEngineReg
+} // namespace CopyEngineReg
 
 
diff --git a/src/dev/i8254xGBe_defs.hh b/src/dev/i8254xGBe_defs.hh
index c37a6dc0e..71a7c16da 100644
--- a/src/dev/i8254xGBe_defs.hh
+++ b/src/dev/i8254xGBe_defs.hh
@@ -851,4 +851,4 @@ struct Regs {
         UNSERIALIZE_SCALAR(sw_fw_sync);
     }
 };
-} // iGbReg namespace
+} // namespace iGbReg
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc
index 86090e048..2183d9d99 100644
--- a/src/dev/sinic.cc
+++ b/src/dev/sinic.cc
@@ -1714,7 +1714,7 @@ Device::unserialize(Checkpoint *cp, const std::string &section)
 
 }
 
-/* namespace Sinic */ }
+} // namespace Sinic
 
 Sinic::Device *
 SinicParams::create()
diff --git a/src/dev/sinic.hh b/src/dev/sinic.hh
index d2124d8ce..0da7ccae4 100644
--- a/src/dev/sinic.hh
+++ b/src/dev/sinic.hh
@@ -349,6 +349,6 @@ class Interface : public EtherInt
     virtual void sendDone() { dev->transferDone(); }
 };
 
-/* namespace Sinic */ }
+} // namespace Sinic
 
 #endif // __DEV_SINIC_HH__
diff --git a/src/dev/sinicreg.hh b/src/dev/sinicreg.hh
index 7ac7abad0..43dc46dc4 100644
--- a/src/dev/sinicreg.hh
+++ b/src/dev/sinicreg.hh
@@ -178,7 +178,7 @@ struct Info
     const char *name;
 };
 
-/* namespace Regs */ }
+} // namespace Regs
 
 inline const Regs::Info&
 regInfo(Addr daddr)
@@ -234,6 +234,6 @@ regValid(Addr daddr)
     return true;
 }
 
-/* namespace Sinic */ }
+} // namespace Sinic
 
 #endif // __DEV_SINICREG_HH__
diff --git a/src/dev/x86/cmos.hh b/src/dev/x86/cmos.hh
index 76276dbc1..22cd9e3af 100644
--- a/src/dev/x86/cmos.hh
+++ b/src/dev/x86/cmos.hh
@@ -84,6 +84,6 @@ class Cmos : public BasicPioDevice
     Tick write(PacketPtr pkt);
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_CMOS_HH__
diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh
index 8a941f9a5..7aa59e9a7 100644
--- a/src/dev/x86/i8042.hh
+++ b/src/dev/x86/i8042.hh
@@ -254,6 +254,6 @@ class I8042 : public BasicPioDevice
     Tick write(PacketPtr pkt);
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_I8042_HH__
diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh
index c3a832aa9..70717f6ba 100644
--- a/src/dev/x86/i82094aa.hh
+++ b/src/dev/x86/i82094aa.hh
@@ -132,6 +132,6 @@ class I82094AA : public PioDevice, public IntDev
     void registerLocalApic(int id, Interrupts *localApic);
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_SOUTH_BRIDGE_I8254_HH__
diff --git a/src/dev/x86/i8237.hh b/src/dev/x86/i8237.hh
index 2d73b8ab5..1db91236a 100644
--- a/src/dev/x86/i8237.hh
+++ b/src/dev/x86/i8237.hh
@@ -61,6 +61,6 @@ class I8237 : public BasicPioDevice
     Tick write(PacketPtr pkt);
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_I8237_HH__
diff --git a/src/dev/x86/i8254.hh b/src/dev/x86/i8254.hh
index 7de20dfd4..e295f5105 100644
--- a/src/dev/x86/i8254.hh
+++ b/src/dev/x86/i8254.hh
@@ -111,6 +111,6 @@ class I8254 : public BasicPioDevice
     }
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_SOUTH_BRIDGE_I8254_HH__
diff --git a/src/dev/x86/i8259.hh b/src/dev/x86/i8259.hh
index a9c5baa8c..a9362d403 100644
--- a/src/dev/x86/i8259.hh
+++ b/src/dev/x86/i8259.hh
@@ -110,6 +110,6 @@ class I8259 : public BasicPioDevice, public IntDev
     int getVector();
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_I8259_HH__
diff --git a/src/dev/x86/intdev.hh b/src/dev/x86/intdev.hh
index 8f5f8707e..b01d36e37 100644
--- a/src/dev/x86/intdev.hh
+++ b/src/dev/x86/intdev.hh
@@ -234,6 +234,6 @@ class IntLine : public SimObject
     }
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_INTDEV_HH__
diff --git a/src/dev/x86/speaker.hh b/src/dev/x86/speaker.hh
index 6778dcb28..fb7476ca0 100644
--- a/src/dev/x86/speaker.hh
+++ b/src/dev/x86/speaker.hh
@@ -74,6 +74,6 @@ class Speaker : public BasicPioDevice
     Tick write(PacketPtr pkt);
 };
 
-}; // namespace X86ISA
+} // namespace X86ISA
 
 #endif //__DEV_X86_SPEAKER_HH__
-- 
cgit v1.2.3