[Boost-commit] svn:boost r63924 - in trunk/boost/spirit/home: karma/detail support

Subject: [Boost-commit] svn:boost r63924 - in trunk/boost/spirit/home: karma/detail support
From: hartmut.kaiser_at_[hidden]
Date: 2010-07-12 09:47:41

Author: hkaiser
Date: 2010-07-12 09:47:40 EDT (Mon, 12 Jul 2010)
New Revision: 63924
URL: http://svn.boost.org/trac/boost/changeset/63924

Log:
Spirit: extended fix for gcc 3.x to intel compilers on apple
Text files modified: 
   trunk/boost/spirit/home/karma/detail/extract_from.hpp |     3 ++-                                     
   trunk/boost/spirit/home/support/attributes_fwd.hpp    |     7 +++++--                                 
   2 files changed, 7 insertions(+), 3 deletions(-)

Modified: trunk/boost/spirit/home/karma/detail/extract_from.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/detail/extract_from.hpp	(original)
+++ trunk/boost/spirit/home/karma/detail/extract_from.hpp	2010-07-12 09:47:40 EDT (Mon, 12 Jul 2010)
@@ -120,7 +120,8 @@
     template <typename Exposed, typename Attribute, typename Context>
     typename spirit::result_of::extract_from<Exposed, Attribute>::type
     extract_from(Attribute const& attr, Context& ctx
-#if defined(__GNUC__) && (__GNUC__ < 4)
+#if (defined(__GNUC__) && (__GNUC__ < 4)) || \
+    (defined(__APPLE__) && defined(__INTEL_COMPILER))
       , typename enable_if<traits::not_is_unused<Attribute> >::type*
 #endif
     )

Modified: trunk/boost/spirit/home/support/attributes_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/support/attributes_fwd.hpp	(original)
+++ trunk/boost/spirit/home/support/attributes_fwd.hpp	2010-07-12 09:47:40 EDT (Mon, 12 Jul 2010)
@@ -12,7 +12,9 @@
 #pragma once
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ < 4)
+#include <boost/config.hpp>
+#if (defined(__GNUC__) && (__GNUC__ < 4)) || \
+    (defined(__APPLE__) && defined(__INTEL_COMPILER))
 #include <boost/utility/enable_if.hpp>
 #endif
 
@@ -109,7 +111,8 @@
     template <typename Exposed, typename Attribute, typename Context>
     typename spirit::result_of::extract_from<Exposed, Attribute>::type
     extract_from(Attribute const& attr, Context& ctx
-#if defined(__GNUC__) && (__GNUC__ < 4)
+#if (defined(__GNUC__) && (__GNUC__ < 4)) || \
+    (defined(__APPLE__) && defined(__INTEL_COMPILER))
       , typename enable_if<traits::not_is_unused<Attribute> >::type* = NULL
 #endif
     );