24 files changed, 25 insertions, 25 deletions

diff --git a/src/base/cprintf.cc b/src/base/cprintf.cc
index 5c11e501c..4f825c097 100644
--- a/src/base/cprintf.cc
+++ b/src/base/cprintf.cc
@@ -291,4 +291,4 @@ Print::end_args()
     stream.precision(saved_precision);
 }
 
-/* end namespace cp */ }
+} // namespace cp
diff --git a/src/base/cprintf.hh b/src/base/cprintf.hh
index 2920e210d..cd5d642c1 100644
--- a/src/base/cprintf.hh
+++ b/src/base/cprintf.hh
@@ -125,7 +125,7 @@ struct Print
     void end_args();
 };
 
-/* end namespace cp */ }
+} // namespace cp
 
 typedef VarArgs::List<cp::Print> CPrintfArgsList;
 
diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh
index eac1c6dc7..e3a72bcf5 100644
--- a/src/base/hashmap.hh
+++ b/src/base/hashmap.hh
@@ -92,6 +92,6 @@ namespace __hash_namespace {
             return (__stl_hash_string(r.first.c_str())) ^ r.second;
         }
     };
-/* namespace __hash_namespace */ }
+} // namespace __hash_namespace
 
 #endif // __HASHMAP_HH__
diff --git a/src/base/inet.cc b/src/base/inet.cc
index 3f804b01c..e4612c02d 100644
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -297,4 +297,4 @@ hsplit(const EthPacketPtr &ptr)
 }
 
 
-/* namespace Net */ }
+} // namespace Net
diff --git a/src/base/inet.hh b/src/base/inet.hh
index b2a84e279..ecb088289 100644
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -472,6 +472,6 @@ uint16_t cksum(const UdpPtr &ptr);
 
 int hsplit(const EthPacketPtr &ptr);
 
-/* namespace Net */ }
+} // namespace Net
 
 #endif // __BASE_INET_HH__
diff --git a/src/base/mysql.cc b/src/base/mysql.cc
index 2416c766a..3216bcf43 100644
--- a/src/base/mysql.cc
+++ b/src/base/mysql.cc
@@ -109,4 +109,4 @@ Connection::query(const string &sql)
 }
 
 
-/* namespace MySQL */ }
+} // namespace MySQL
diff --git a/src/base/mysql.hh b/src/base/mysql.hh
index 272a0f07c..c9051bd2b 100644
--- a/src/base/mysql.hh
+++ b/src/base/mysql.hh
@@ -420,6 +420,6 @@ class Statement
 }
 #endif
 
-/* namespace MySQL */ }
+} // namespace MySQL
 
 #endif // __BASE_MYSQL_HH__
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index 853f3a58d..1e108298a 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -377,4 +377,4 @@ registerResetCallback(Callback *cb)
     resetQueue.add(cb);
 }
 
-/* namespace Stats */ }
+} // namespace Stats
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 7eb769e43..3bb74282a 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -2784,6 +2784,6 @@ void registerResetCallback(Callback *cb);
 
 std::list<Info *> &statsList();
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATISTICS_HH__
diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index e5b9e4a65..421ed4a55 100644
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -232,6 +232,6 @@ class FormulaInfo : public VectorInfo
 };
 
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_INFO_HH__
diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index 9d2dadb01..d947122da 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -836,4 +836,4 @@ initMySQL(string host, string user, string password, string database,
     return true;
 }
 
-/* end namespace Stats */ }
+} // namespace Stats
diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh
index 687f030f2..a09ee095c 100644
--- a/src/base/stats/mysql.hh
+++ b/src/base/stats/mysql.hh
@@ -179,6 +179,6 @@ initMySQL(std::string host, std::string user, std::string password,
 }
 #endif
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_MYSQL_HH__
diff --git a/src/base/stats/mysql_run.hh b/src/base/stats/mysql_run.hh
index 7207cd841..29ca168dd 100644
--- a/src/base/stats/mysql_run.hh
+++ b/src/base/stats/mysql_run.hh
@@ -62,6 +62,6 @@ struct MySqlRun
     uint16_t run() const { return run_id; }
 };
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_MYSQL_RUN_HH__
diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc
index ae2c9db5e..9d110e4ee 100644
--- a/src/base/stats/output.cc
+++ b/src/base/stats/output.cc
@@ -63,7 +63,7 @@ dump()
     }
 }
 
-/* namespace Stats */ }
+} // namespace Stats
 
 void
 debugDumpStats()
diff --git a/src/base/stats/output.hh b/src/base/stats/output.hh
index 4fe93791f..0f485dee3 100644
--- a/src/base/stats/output.hh
+++ b/src/base/stats/output.hh
@@ -44,6 +44,6 @@ struct Output : public Visit
     virtual bool valid() const = 0;
 };
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_OUTPUT_HH__
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 425a917ef..576f7e5d4 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -594,4 +594,4 @@ initText(const string &filename, bool desc)
     return true;
 }
 
-/* namespace Stats */ }
+} // namespace Stats
diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh
index 0cb66ded8..ab8512859 100644
--- a/src/base/stats/text.hh
+++ b/src/base/stats/text.hh
@@ -75,6 +75,6 @@ class Text : public Output
 
 bool initText(const std::string &filename, bool desc);
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_TEXT_HH__
diff --git a/src/base/stats/types.hh b/src/base/stats/types.hh
index 87cf91653..9faa8d33d 100644
--- a/src/base/stats/types.hh
+++ b/src/base/stats/types.hh
@@ -53,6 +53,6 @@ typedef std::vector<Result> VResult;
 typedef unsigned int size_type;
 typedef unsigned int off_type;
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_TYPES_HH__
diff --git a/src/base/stats/visit.cc b/src/base/stats/visit.cc
index 6680eaa09..1d13bc25d 100644
--- a/src/base/stats/visit.cc
+++ b/src/base/stats/visit.cc
@@ -38,4 +38,4 @@ Visit::Visit()
 Visit::~Visit()
 {}
 
-/* namespace Stats */ }
+} // namespace Stats
diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index f5c2fc34c..fae7a8883 100644
--- a/src/base/stats/visit.hh
+++ b/src/base/stats/visit.hh
@@ -55,6 +55,6 @@ struct Visit
     virtual void visit(const FormulaInfo &info) = 0;
 };
 
-/* namespace Stats */ }
+} // namespace Stats
 
 #endif // __BASE_STATS_VISIT_HH__
diff --git a/src/base/stl_helpers.hh b/src/base/stl_helpers.hh
index 9add7b8b6..a34ca7bb6 100644
--- a/src/base/stl_helpers.hh
+++ b/src/base/stl_helpers.hh
@@ -92,7 +92,7 @@ operator<<(std::ostream& out, const C<T,A> &vec)
     return out;
 }
 
-/* namespace stl_helpers */ }
-/* namespace m5 */ }
+} // namespace stl_helpers
+} // namespace m5
 
 #endif // __BASE_STL_HELPERS_HH__
diff --git a/src/base/trace.cc b/src/base/trace.cc
index 0a7e6e833..22e05e664 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -188,7 +188,7 @@ dumpStatus()
     }
 }
 
-/* namespace Trace */ }
+} // namespace Trace
 
 
 // add a set of functions that can easily be invoked from gdb
diff --git a/src/base/trace.hh b/src/base/trace.hh
index 6f8c196b0..f793abff9 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -60,7 +60,7 @@ void dprintf(Tick when, const std::string &name, const char *format,
              CPRINTF_DECLARATION);
 void dump(Tick when, const std::string &name, const void *data, int len);
 
-/* namespace Trace */ }
+} // namespace Trace
 
 // This silly little class allows us to wrap a string in a functor
 // object so that we can give a name() that DPRINTF will like
diff --git a/src/base/varargs.hh b/src/base/varargs.hh
index 4328f2057..87c98d006 100644
--- a/src/base/varargs.hh
+++ b/src/base/varargs.hh
@@ -303,6 +303,6 @@ class List
     }
 };
 
-/* end namespace VarArgs */ }
+} // namespace VarArgs
 
 #endif /* __BASE_VARARGS_HH__ */