diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:30:07 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:32:57 +0900 |
| commit | 71d216b90256936a9638f325af9bc69d720e75de (patch) | |
| tree | 9c5f682d341c7c88ad0c8e3d4b262e00b6fb691a /boost/property_tree/json_parser.hpp | |
| parent | 733b5d5ae2c5d625211e2985ac25728ac3f54883 (diff) | |
| download | boost-71d216b90256936a9638f325af9bc69d720e75de.tar.gz boost-71d216b90256936a9638f325af9bc69d720e75de.tar.bz2 boost-71d216b90256936a9638f325af9bc69d720e75de.zip | |
Imported Upstream version 1.59.0
Change-Id: I2dde00f4eca71df3eea9d251dcaecde18a6c90a5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/property_tree/json_parser.hpp')
| -rw-r--r-- | boost/property_tree/json_parser.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/boost/property_tree/json_parser.hpp b/boost/property_tree/json_parser.hpp index d3bc32edb1..d8a3e1025f 100644 --- a/boost/property_tree/json_parser.hpp +++ b/boost/property_tree/json_parser.hpp @@ -1,5 +1,6 @@ // ---------------------------------------------------------------------------- // Copyright (C) 2002-2006 Marcin Kalicinski +// Copyright (C) 2015 Sebastian Redl // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -11,9 +12,9 @@ #define BOOST_PROPERTY_TREE_JSON_PARSER_HPP_INCLUDED #include <boost/property_tree/ptree.hpp> -#include <boost/property_tree/detail/json_parser_read.hpp> -#include <boost/property_tree/detail/json_parser_write.hpp> #include <boost/property_tree/detail/json_parser_error.hpp> +#include <boost/property_tree/detail/json_parser/read.hpp> +#include <boost/property_tree/detail/json_parser_write.hpp> #include <fstream> #include <string> @@ -42,7 +43,7 @@ namespace boost { namespace property_tree { namespace json_parser > &stream, Ptree &pt) { - read_json_internal(stream, pt, std::string()); + detail::read_json_internal(stream, pt, std::string()); } /** @@ -71,7 +72,7 @@ namespace boost { namespace property_tree { namespace json_parser BOOST_PROPERTY_TREE_THROW(json_parser_error( "cannot open file", filename, 0)); stream.imbue(loc); - read_json_internal(stream, pt, filename); + detail::read_json_internal(stream, pt, filename); } /** |