[Boost-commit] svn:boost r61605 - trunk/boost/property_tree/detail

Subject: [Boost-commit] svn:boost r61605 - trunk/boost/property_tree/detail
From: sebastian.redl_at_[hidden]
Date: 2010-04-27 04:59:35

Author: cornedbee
Date: 2010-04-27 04:59:34 EDT (Tue, 27 Apr 2010)
New Revision: 61605
URL: http://svn.boost.org/trac/boost/changeset/61605

Log:
Cater to compilers too stupid to interpret a bitwise OR in a template argument as a constant.

Fixes bug 4146
Text files modified: 
   trunk/boost/property_tree/detail/xml_parser_read_rapidxml.hpp |     6 +++++-                                  
   1 files changed, 5 insertions(+), 1 deletions(-)

Modified: trunk/boost/property_tree/detail/xml_parser_read_rapidxml.hpp
==============================================================================
--- trunk/boost/property_tree/detail/xml_parser_read_rapidxml.hpp	(original)
+++ trunk/boost/property_tree/detail/xml_parser_read_rapidxml.hpp	2010-04-27 04:59:34 EDT (Tue, 27 Apr 2010)
@@ -106,6 +106,10 @@
             const int f_tws = parse_normalize_whitespace
                             | parse_trim_whitespace;
             const int f_c = parse_comment_nodes;
+            // Some compilers don't like the bitwise or in the template arg.
+            const int f_tws_c = parse_normalize_whitespace
+                              | parse_trim_whitespace
+                              | parse_comment_nodes;
             xml_document<Ch> doc;
             if (flags & no_comments) {
                 if (flags & trim_whitespace)
@@ -114,7 +118,7 @@
                     doc.BOOST_NESTED_TEMPLATE parse<0>(&v.front());
             } else {
                 if (flags & trim_whitespace)
-                    doc.BOOST_NESTED_TEMPLATE parse<f_tws | f_c>(&v.front());
+                    doc.BOOST_NESTED_TEMPLATE parse<f_tws_c>(&v.front());
                 else
                     doc.BOOST_NESTED_TEMPLATE parse<f_c>(&v.front());
             }