[Boost-commit] svn:boost r61876 - trunk/boost/xpressive/detail/utility

Subject: [Boost-commit] svn:boost r61876 - trunk/boost/xpressive/detail/utility
From: dgregor_at_[hidden]
Date: 2010-05-09 09:40:46

Author: dgregor
Date: 2010-05-09 09:40:45 EDT (Sun, 09 May 2010)
New Revision: 61876
URL: http://svn.boost.org/trac/boost/changeset/61876

Log:
Both Proto and Xpressive have "ignore_unused" templates in their
detail headers, and both were getting included, causing overloading
ambiguities. There is probably a major cleanup to do here, moving to a
single "ignore_unused" in boost/detail, but for now I've rectified the
problem by describing importing Proto's ignore_unused() into Xpressive
rather than defining a new one.

Text files modified: 
   trunk/boost/xpressive/detail/utility/ignore_unused.hpp |     9 +++------                               
   1 files changed, 3 insertions(+), 6 deletions(-)

Modified: trunk/boost/xpressive/detail/utility/ignore_unused.hpp
==============================================================================
--- trunk/boost/xpressive/detail/utility/ignore_unused.hpp	(original)
+++ trunk/boost/xpressive/detail/utility/ignore_unused.hpp	2010-05-09 09:40:45 EDT (Sun, 09 May 2010)
@@ -13,14 +13,11 @@
 # pragma once
 #endif
 
+#include "boost/proto/detail/ignore_unused.hpp"
+
 namespace boost { namespace xpressive { namespace detail
 {
-
-    template<typename T>
-    void ignore_unused(T const &)
-    {
-    }
-
+  using boost::proto::detail::ignore_unused;
 }}}
 
 #endif