Update of /cvsroot/boost/boost/boost/spirit/utility/impl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32101
Modified Files:
Tag: SPIRIT_1_6
chset_operators.ipp
Log Message:
Corrected problem with operators not found by ADL
Index: chset_operators.ipp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/utility/impl/chset_operators.ipp,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -d -r1.8.2.5 -r1.8.2.6
--- chset_operators.ipp 25 Nov 2004 11:12:49 -0000 1.8.2.5
+++ chset_operators.ipp 26 Feb 2007 23:46:51 -0000 1.8.2.6
@@ -257,7 +257,11 @@
inline chset<CharT>
operator|(chlit<CharT> const& a, chset<CharT> const& b)
{
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
return a.ch | b;
+#else
+ return operator| <CharT> (a.ch, b);
+#endif
}
//////////////////////////////////
@@ -265,7 +269,11 @@
inline chset<CharT>
operator&(chlit<CharT> const& a, chset<CharT> const& b)
{
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
return a.ch & b;
+#else
+ return operator& <CharT> (a.ch, b);
+#endif
}
//////////////////////////////////
@@ -273,7 +281,11 @@
inline chset<CharT>
operator-(chlit<CharT> const& a, chset<CharT> const& b)
{
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
return a.ch - b;
+#else
+ return operator- <CharT> (a.ch, b);
+#endif
}
//////////////////////////////////
@@ -281,10 +293,14 @@
inline chset<CharT>
operator^(chlit<CharT> const& a, chset<CharT> const& b)
{
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
return a.ch ^ b;
+#else
+ return operator^ <CharT> (a.ch, b);
+#endif
}
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
///////////////////////////////////////////////////////////////////////////////
//
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
