Ticket #4146: boost-property_tree_fix2.diff

boost/property_tree/detail/xml_parser_read_rapidxml.hpp

@@ -103 +103 @@
 
         try {
             // Parse using appropriate flags
-            const int f_tws = parse_normalize_whitespace
-                            | parse_trim_whitespace;
+            const int f_tws = (parse_normalize_whitespace
+                               | parse_trim_whitespace);
             const int f_c = parse_comment_nodes;
+            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 +117 @@
                     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());
             }