really screwy merge trancking behavior, starting over

[SVN r44394]
post-review proto version
2008-04-14 05:45:24 +00:00 · 2008-04-05 18:00:00 +00:00 · 2008-02-10 15:02:17 +00:00 · 2007-12-15 03:42:49 +00:00 · 2007-12-10 15:19:21 +00:00
2 changed files with 3 additions and 1 deletions
--- a/doc/rst2html
+++ b/doc/rst2html
--- a/include/boost/iterator/detail/config_def.hpp
+++ b/include/boost/iterator/detail/config_def.hpp
@ -49,7 +49,9 @@
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)                                       \
    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x531))                   \
    || (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER)) \
-    || BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
+    || BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))                \
+    || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
+    
 # define BOOST_NO_LVALUE_RETURN_DETECTION

 # if 0 // test code
Author	SHA1	Message	Date
Eric Niebler	5b17847912	really screwy merge trancking behavior, starting over [SVN r44394]	2008-04-14 05:45:24 +00:00
Eric Niebler	28a7807e1e	post-review proto version [SVN r44061]	2008-04-05 18:00:00 +00:00
Daniel James	bf7d904bf8	Point links to the pages that used to be in 'more' to the site. [SVN r43210]	2008-02-10 15:02:17 +00:00
Boris Gubenko	efecbd0d27	don't use identifires R1 and R2: some HP-UX headers define them as macros [SVN r42064]	2007-12-15 03:42:49 +00:00
Dave Abrahams	65e229fb0d	SunPro 5.9 can't detect lvalue returns [SVN r41956]	2007-12-10 15:19:21 +00:00