[Boost-commit] svn:boost r79694 - in branches/release/boost/asio: . detail detail/impl

Subject: [Boost-commit] svn:boost r79694 - in branches/release/boost/asio: . detail detail/impl
From: chris_at_[hidden]
Date: 2012-07-23 07:03:32

Author: chris_kohlhoff
Date: 2012-07-23 07:03:31 EDT (Mon, 23 Jul 2012)
New Revision: 79694
URL: http://svn.boost.org/trac/boost/changeset/79694

Log:
Merge from trunk:

* Decorate GCC attribute names with underscores to prevent interaction with user-defined macros. Fixes #6415

* Add missing #include of <cctype>, needed for some versions of MinGW.

* Use gcc's atomic builtins on arm, when available. Fixes #7140.

Text files modified: 
   branches/release/boost/asio/buffers_iterator.hpp       |     4 ++--                                    
   branches/release/boost/asio/detail/fenced_block.hpp    |     6 ++++--                                  
   branches/release/boost/asio/detail/impl/socket_ops.ipp |     1 +                                       
   3 files changed, 7 insertions(+), 4 deletions(-)

Modified: branches/release/boost/asio/buffers_iterator.hpp
==============================================================================
--- branches/release/boost/asio/buffers_iterator.hpp	(original)
+++ branches/release/boost/asio/buffers_iterator.hpp	2012-07-23 07:03:31 EDT (Mon, 23 Jul 2012)
@@ -128,7 +128,7 @@
   /// Construct an iterator representing the beginning of the buffers' data.
   static buffers_iterator begin(const BufferSequence& buffers)
 #if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
-    __attribute__ ((noinline))
+    __attribute__ ((__noinline__))
 #endif
   {
     buffers_iterator new_iter;
@@ -148,7 +148,7 @@
   /// Construct an iterator representing the end of the buffers' data.
   static buffers_iterator end(const BufferSequence& buffers)
 #if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
-    __attribute__ ((noinline))
+    __attribute__ ((__noinline__))
 #endif
   {
     buffers_iterator new_iter;

Modified: branches/release/boost/asio/detail/fenced_block.hpp
==============================================================================
--- branches/release/boost/asio/detail/fenced_block.hpp	(original)
+++ branches/release/boost/asio/detail/fenced_block.hpp	2012-07-23 07:03:31 EDT (Mon, 23 Jul 2012)
@@ -25,7 +25,8 @@
 # include <boost/asio/detail/macos_fenced_block.hpp>
 #elif defined(__sun)
 # include <boost/asio/detail/solaris_fenced_block.hpp>
-#elif defined(__GNUC__) && defined(__arm__)
+#elif defined(__GNUC__) && defined(__arm__) \
+  && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
 # include <boost/asio/detail/gcc_arm_fenced_block.hpp>
 #elif defined(__GNUC__) && (defined(__hppa) || defined(__hppa__))
 # include <boost/asio/detail/gcc_hppa_fenced_block.hpp>
@@ -54,7 +55,8 @@
 typedef macos_fenced_block fenced_block;
 #elif defined(__sun)
 typedef solaris_fenced_block fenced_block;
-#elif defined(__GNUC__) && defined(__arm__)
+#elif defined(__GNUC__) && defined(__arm__) \
+  && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
 typedef gcc_arm_fenced_block fenced_block;
 #elif defined(__GNUC__) && (defined(__hppa) || defined(__hppa__))
 typedef gcc_hppa_fenced_block fenced_block;

Modified: branches/release/boost/asio/detail/impl/socket_ops.ipp
==============================================================================
--- branches/release/boost/asio/detail/impl/socket_ops.ipp	(original)
+++ branches/release/boost/asio/detail/impl/socket_ops.ipp	2012-07-23 07:03:31 EDT (Mon, 23 Jul 2012)
@@ -18,6 +18,7 @@
 #include <boost/asio/detail/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/detail/workaround.hpp>
+#include <cctype>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>