From b75f7a4eac8f4559cbc03283e13fdf4a54b042ba Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Thu, 24 Jun 2010 04:21:07 +0000 Subject: [PATCH] Merged revisions 61876,63280 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r61876 | dgregor | 2010-05-09 09:40:45 -0400 (Sun, 09 May 2010) | 8 lines 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. ........ r63280 | eric_niebler | 2010-06-24 00:08:23 -0400 (Thu, 24 Jun 2010) | 1 line qualify calls to ignore_unused ........ [SVN r63281] --- libs/xpressive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/xpressive b/libs/xpressive index b597ec29a6..79eb4f71c6 160000 --- a/libs/xpressive +++ b/libs/xpressive @@ -1 +1 @@ -Subproject commit b597ec29a6266dfc63a8bfba9f9df85fdad23fef +Subproject commit 79eb4f71c62cf18bb8a73cebf0ec68074aa644c1