Subject: [Boost-commit] svn:boost r66398 - trunk/boost/asio/detail
From: chris_at_[hidden]
Date: 2010-11-04 07:40:45
Author: chris_kohlhoff
Date: 2010-11-04 07:40:42 EDT (Thu, 04 Nov 2010)
New Revision: 66398
URL: http://svn.boost.org/trac/boost/changeset/66398
Log:
MacPorts gcc also defines __APPLE_CC__, but to 1.
Text files modified:
trunk/boost/asio/detail/pop_options.hpp | 12 +++++++-----
trunk/boost/asio/detail/push_options.hpp | 14 ++++++++------
2 files changed, 15 insertions(+), 11 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-11-04 07:40:42 EDT (Thu, 04 Nov 2010)
@@ -31,11 +31,13 @@
# pragma pack (pop)
# endif
-# if defined(__OBJC__) && !defined(__APPLE_CC__)
-# if defined(BOOST_ASIO_OBJC_WORKAROUND)
-# undef Protocol
-# undef id
-# undef BOOST_ASIO_OBJC_WORKAROUND
+# if defined(__OBJC__)
+# if !defined(__APPLE_CC__) || (__APPLE_CC__ <= 1)
+# if defined(BOOST_ASIO_OBJC_WORKAROUND)
+# undef Protocol
+# undef id
+# undef BOOST_ASIO_OBJC_WORKAROUND
+# endif
# endif
# endif
Modified: trunk/boost/asio/detail/push_options.hpp
==============================================================================
--- trunk/boost/asio/detail/push_options.hpp (original)
+++ trunk/boost/asio/detail/push_options.hpp 2010-11-04 07:40:42 EDT (Thu, 04 Nov 2010)
@@ -31,12 +31,14 @@
# pragma pack (push, 8)
# endif
-# if defined(__OBJC__) && !defined(__APPLE_CC__)
-# if !defined(BOOST_ASIO_DISABLE_OBJC_WORKAROUND)
-# if !defined(Protocol) && !defined(id)
-# define Protocol cpp_Protocol
-# define id cpp_id
-# define BOOST_ASIO_OBJC_WORKAROUND
+# if defined(__OBJC__)
+# if !defined(__APPLE_CC__) || (__APPLE_CC__ <= 1)
+# if !defined(BOOST_ASIO_DISABLE_OBJC_WORKAROUND)
+# if !defined(Protocol) && !defined(id)
+# define Protocol cpp_Protocol
+# define id cpp_id
+# define BOOST_ASIO_OBJC_WORKAROUND
+# endif
# endif
# endif
# endif