[Boost-commit] svn:boost r66143 - trunk/boost/asio/detail

Subject: [Boost-commit] svn:boost r66143 - trunk/boost/asio/detail
From: chris_at_[hidden]
Date: 2010-10-22 08:07:39

Author: chris_kohlhoff
Date: 2010-10-22 08:07:36 EDT (Fri, 22 Oct 2010)
New Revision: 66143
URL: http://svn.boost.org/trac/boost/changeset/66143

Log:
Redefine Protocol and id to avoid clashing with Objective-C++ keywords. Refs #4191.

Text files modified: 
   trunk/boost/asio/detail/pop_options.hpp  |     5 +++++                                   
   trunk/boost/asio/detail/push_options.hpp |     7 +++++++                                 
   2 files changed, 12 insertions(+), 0 deletions(-)

Modified: trunk/boost/asio/detail/pop_options.hpp
==============================================================================
--- trunk/boost/asio/detail/pop_options.hpp	(original)
+++ trunk/boost/asio/detail/pop_options.hpp	2010-10-22 08:07:36 EDT (Fri, 22 Oct 2010)
@@ -31,6 +31,11 @@
 #  pragma pack (pop)
 # endif
 
+# if defined(__OBJC__)
+#  pragma pop_macro("Protocol")
+#  pragma pop_macro("id")
+# endif
+
 #elif defined(__KCC)
 
 // Kai C++

Modified: trunk/boost/asio/detail/push_options.hpp
==============================================================================
--- trunk/boost/asio/detail/push_options.hpp	(original)
+++ trunk/boost/asio/detail/push_options.hpp	2010-10-22 08:07:36 EDT (Fri, 22 Oct 2010)
@@ -31,6 +31,13 @@
 #  pragma pack (push, 8)
 # endif
 
+# if defined(__OBJC__)
+#  pragma push_macro("Protocol")
+#  define Protocol cpp_Protocol
+#  pragma push_macro("id")
+#  define id cpp_id
+# endif
+
 #elif defined(__KCC)
 
 // Kai C++