[Boost-commit] svn:boost r84329 - in trunk: boost/thread boost/thread/detail boost/thread/v2 libs/thread/example

Subject: [Boost-commit] svn:boost r84329 - in trunk: boost/thread boost/thread/detail boost/thread/v2 libs/thread/example
From: vicente.botet_at_[hidden]
Date: 2013-05-17 15:20:46

Author: viboes
Date: 2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
New Revision: 84329
URL: http://svn.boost.org/trac/boost/changeset/84329

Log:
Thread: fix inspection report.
Text files modified: 
   trunk/boost/thread/detail/is_convertible.hpp          |     7 ++++---                                 
   trunk/boost/thread/detail/memory.hpp                  |     7 ++++---                                 
   trunk/boost/thread/future.hpp                         |     2 +-                                      
   trunk/boost/thread/v2/shared_mutex.hpp                |     6 +++---                                  
   trunk/libs/thread/example/perf_condition_variable.cpp |     4 ++--                                    
   trunk/libs/thread/example/perf_shared_mutex.cpp       |     4 ++--                                    
   6 files changed, 16 insertions(+), 14 deletions(-)

Modified: trunk/boost/thread/detail/is_convertible.hpp
==============================================================================
--- trunk/boost/thread/detail/is_convertible.hpp	(original)
+++ trunk/boost/thread/detail/is_convertible.hpp	2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
@@ -1,8 +1,9 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright 2011-2012 Vicente J. Botet Escriba
-// Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright (C) 2011-2013 Vicente J. Botet Escriba
+//
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 // See http://www.boost.org/libs/thread for documentation.
 //

Modified: trunk/boost/thread/detail/memory.hpp
==============================================================================
--- trunk/boost/thread/detail/memory.hpp	(original)
+++ trunk/boost/thread/detail/memory.hpp	2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
@@ -1,8 +1,9 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright 2011-2012 Vicente J. Botet Escriba
-// Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright (C) 2011-2013 Vicente J. Botet Escriba
+//
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 // See http://www.boost.org/libs/thread for documentation.
 //

Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp	(original)
+++ trunk/boost/thread/future.hpp	2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
@@ -1552,7 +1552,7 @@
             static_cast<base_type*>(this)->swap(other);
         }
 
-        // todo this functioˆn must be private and friendship provided to the internal users.
+        // todo this function must be private and friendship provided to the internal users.
         void set_async()
         {
           this->future_->set_async();

Modified: trunk/boost/thread/v2/shared_mutex.hpp
==============================================================================
--- trunk/boost/thread/v2/shared_mutex.hpp	(original)
+++ trunk/boost/thread/v2/shared_mutex.hpp	2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
@@ -179,15 +179,15 @@
       BOOST_THREAD_INLINE shared_mutex();
       BOOST_THREAD_INLINE ~shared_mutex();
 
-#ifndef BOOST_NO_DELETED_FUNCTIONS
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
       shared_mutex(shared_mutex const&) = delete;
       shared_mutex& operator=(shared_mutex const&) = delete;
-#else // BOOST_NO_DELETED_FUNCTIONS
+#else // BOOST_NO_CXX11_DELETED_FUNCTIONS
     private:
       shared_mutex(shared_mutex const&);
       shared_mutex& operator=(shared_mutex const&);
     public:
-#endif // BOOST_NO_DELETED_FUNCTIONS
+#endif // BOOST_NO_CXX11_DELETED_FUNCTIONS
 
       // Exclusive ownership
 

Modified: trunk/libs/thread/example/perf_condition_variable.cpp
==============================================================================
--- trunk/libs/thread/example/perf_condition_variable.cpp	(original)
+++ trunk/libs/thread/example/perf_condition_variable.cpp	2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
@@ -143,7 +143,7 @@
   {
     typedef SharedData<Types> S;
 
-    auto best_producer_time = std::numeric_limits<Stopwatch::rep>::max();
+    auto best_producer_time = std::numeric_limits<Stopwatch::rep>::max BOOST_PREVENT_MACRO_SUBSTITUTION ();
 
     std::vector<std::thread> consumers
     { consumer_count };
@@ -165,7 +165,7 @@
       for (unsigned i = 0; i < consumer_count; ++i)
         consumers[i].join();
 
-      best_producer_time = std::min(best_producer_time, shared_data.producer_time);
+      best_producer_time = std::min BOOST_PREVENT_MACRO_SUBSTITUTION (best_producer_time, shared_data.producer_time);
 
     }
 

Modified: trunk/libs/thread/example/perf_shared_mutex.cpp
==============================================================================
--- trunk/libs/thread/example/perf_shared_mutex.cpp	(original)
+++ trunk/libs/thread/example/perf_shared_mutex.cpp	2013-05-17 15:20:45 EDT (Fri, 17 May 2013)
@@ -42,7 +42,7 @@
 
 int main()
 {
-  boost::chrono::high_resolution_clock::duration best_time(std::numeric_limits<boost::chrono::high_resolution_clock::duration::rep>::max());
+  boost::chrono::high_resolution_clock::duration best_time(std::numeric_limits<boost::chrono::high_resolution_clock::duration::rep>::max BOOST_PREVENT_MACRO_SUBSTITUTION ());
   for (int i =100; i>0; --i) {
     boost::chrono::high_resolution_clock clock;
     boost::chrono::high_resolution_clock::time_point s1 = clock.now();
@@ -61,7 +61,7 @@
   //  t13.join();
     boost::chrono::high_resolution_clock::time_point f1 = clock.now();
     //std::cout << "     Time spent:" << (f1 - s1) << std::endl;
-    best_time = std::min(best_time, f1 - s1);
+    best_time = std::min BOOST_PREVENT_MACRO_SUBSTITUTION (best_time, f1 - s1);
 
   }
   std::cout << "Best Time spent:" << best_time << std::endl;