Merge minor changes from main branch.

[SVN r22319]

example/monitor.cpp

@@ -19,7 +19,7 @@
 namespace {
 const int ITERS = 100;
 boost::mutex io_mutex;
-}
+} // namespace
 
 template <typename M>
 class buffer_t

example/starvephil.cpp

@@ -51,8 +51,8 @@ public:
         {
             boost::mutex::scoped_lock lock(iomx);
             std::cout << "(" << clock()
-                      << ") Chef: ouch ... make room ... this dish is very "
-                      << "hot ..." << std::endl;
+                      << ") Chef: ouch ... make room ... this dish is "
+                      << "very hot ..." << std::endl;
         }
         boost::xtime xt;
         boost::xtime_get(&xt, boost::TIME_UTC);
@@ -108,8 +108,8 @@ struct phil
     void run() {
         {
             boost::mutex::scoped_lock lock(iomx);
-            std::cout << "(" << clock() << ") Phil" << m_id << ": starting ..."
-                      << std::endl;
+            std::cout << "(" << clock() << ") Phil" << m_id
+                      << ": starting ..." << std::endl;
         }
         for (;;)
         {

include/boost/thread/detail/singleton.hpp

@@ -33,19 +33,19 @@ public:
 };
 
 
-template<class T>
+template <class T>
 inline singleton<T>::singleton()
 {
     /* no-op */
 }
 
-template<class T>
+template <class T>
 inline singleton<T>::~singleton()
 {
     /* no-op */
 }
 
-template<class T>
+template <class T>
 /*static*/ T &singleton<T>::instance()
 {
     // function-local static to force this to work correctly at static