Ticket #4786: boost_1_44_0.property_tree.2.patch

boost/property_tree/detail/info_parser_read.hpp

@@ -288 +288 @@
                             else    // Key text found
                             {
                                 std::basic_string<Ch> key = read_key(text);
-                                last = &stack.top()->push_back(
+                                last = (Ptree*)&stack.top()->push_back(
                                     std::make_pair(key, Ptree()))->second;
                                 state = s_data;
                             }
@@ -322 +322 @@
                             {
                                 bool need_more_lines;
                                 std::basic_string<Ch> data = read_data(text, &need_more_lines);
+                                if (need_more_lines)
+                                {
                                 last->data() = data;
-                                state = need_more_lines ? s_data_cont : s_key;
+                                    state = s_data_cont;
+                                }
+                                else
+                                {
+                                    typename translator_between<
+                                        typename Ptree::data_type,
+                                        std::basic_string<Ch> >::type tr;
+                                    last->data() = *(typename Ptree::data_type*)
+                                        &tr.put_value(data);
+                                    state = s_key;
+                                }
                             }
 
 
@@ -339 +351 @@
                             if (*text == Ch('\"'))  // Continuation must start with "
                             {
                                 bool need_more_lines;
-                                std::basic_string<Ch> data = read_string(text, &need_more_lines);
-                                last->put_value(last->template get_value<std::basic_string<Ch> >() + data);
-                                state = need_more_lines ? s_data_cont : s_key;
+                                std::basic_string<Ch> data =
+                                    last->template get_value<std::basic_string<Ch> >() +
+                                    read_string(text, &need_more_lines);
+
+                                if (need_more_lines)
+                                {
+                                    last->data() = data;
+                                    state = s_data_cont;
+                                }
+                                else
+                                {
+                                    typename translator_between<
+                                        typename Ptree::data_type,
+                                        std::basic_string<Ch> >::type tr;
+                                    last->data() = *(typename Ptree::data_type*)
+                                        &tr.put_value(data);
+                                    state = s_key;
+                                }
                             }
                             else
                                 BOOST_PROPERTY_TREE_THROW(info_parser_error("expected \" after \\ in previous line", "", 0));