boost_mirror/json
1
0
Fork 0
mirror of https://github.com/boostorg/json.git synced 2025-05-11 13:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reference errors

Browse Source
This commit is contained in:
Dmitry Arkhipov 2024-06-14 15:52:58 +03:00
parent 038916a0d4
commit 6ab2ad816b
11 changed files with 85 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/json/array.hpp
View File

@ -117,16 +117,8 @@ class array
array(detail::unchecked_array&& ua);
public:
/** Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
This type is `boost::container::pmr::polymorphic_allocator<value>`.
*/
#ifdef BOOST_JSON_DOCS
using allocator_type = __see_below__;
#else
// VFALCO doc toolchain renders this incorrectly
using allocator_type = container::pmr::polymorphic_allocator<value>;
#endif
/// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
using allocator_type = boost::container::pmr::polymorphic_allocator<value>;
/// The type used to represent unsigned integers
using size_type = std::size_t;
@ -601,7 +593,7 @@ public:
@throw `boost::system::system_error` `pos >= size()`.
*/
/* @{ */
/** @{ */
inline
value&
at(std::size_t pos) &;
@ -613,7 +605,7 @@ public:
inline
value const&
at(std::size_t pos) const&;
/* @} */
/** @} */
/** Access an element.
@ -628,7 +620,7 @@ public:
@param pos A zero-based index
*/
/* @{ */
/** @{ */
inline
value&
operator[](std::size_t pos) & noexcept;
@ -640,7 +632,7 @@ public:
inline
value const&
operator[](std::size_t pos) const& noexcept;
/* @} */
/** @} */
/** Access the first element.
@ -652,7 +644,7 @@ public:
@par Complexity
Constant.
*/
/* @{ */
/** @{ */
inline
value&
front() & noexcept;
@ -664,7 +656,7 @@ public:
inline
value const&
front() const& noexcept;
/* @} */
/** @} */
/** Access the last element.
@ -676,7 +668,7 @@ public:
@par Complexity
Constant.
*/
/* @{ */
/** @{ */
inline
value&
back() & noexcept;
@ -688,7 +680,7 @@ public:
inline
value const&
back() const& noexcept;
/* @} */
/** @} */
/** Access the underlying array directly.

12
include/boost/json/basic_parser.hpp
View File

@ -512,8 +512,6 @@ public:
@param args Optional additional arguments
forwarded to the handler's constructor.
@see parse_options
*/
template<class... Args>
explicit
@ -567,7 +565,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
system::error_code
boost::system::error_code
last_error() const noexcept
{
return ec_;
@ -636,7 +634,7 @@ public:
instead.
*/
void
fail(system::error_code ec) noexcept;
fail(boost::system::error_code ec) noexcept;
/** Parse some of an input string as JSON, incrementally.
@ -688,13 +686,13 @@ public:
@param ec Set to the error, if any occurred.
*/
/** @{ */
/** @{ */
std::size_t
write_some(
bool more,
char const* data,
std::size_t size,
system::error_code& ec);
boost::system::error_code& ec);
std::size_t
write_some(
@ -702,7 +700,7 @@ public:
char const* data,
std::size_t size,
std::error_code& ec);
/** @} */
/** @} */
};
} // namespace json

2
include/boost/json/monotonic_resource.hpp
View File

@ -88,7 +88,7 @@ class
BOOST_JSON_DECL
BOOST_SYMBOL_VISIBLE
monotonic_resource final
: public container::pmr::memory_resource
: public boost::container::pmr::memory_resource
{
struct block;
struct block_base

31
include/boost/json/object.hpp
View File

@ -94,16 +94,8 @@ class object
object(detail::unchecked_object&& uo);
public:
/** Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
This type is a `boost::container::pmr::polymorphic_allocator`.
*/
#ifdef BOOST_JSON_DOCS
using allocator_type = __see_below__;
#else
// VFALCO doc toolchain renders this incorrectly
using allocator_type = container::pmr::polymorphic_allocator<value>;
#endif
/// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
using allocator_type = boost::container::pmr::polymorphic_allocator<value>;
/** The type of keys.
@ -1168,17 +1160,14 @@ public:
/** Erase an element preserving order
Remove the element pointed to by `pos`, which must
be valid and dereferenceable.
References and iterators from `pos` to `end()`, both
included, are invalidated. Other iterators and references
are not invalidated.
The relative order of remaining elements is preserved.
Remove the element pointed to by `pos`, which must be valid and
dereferenceable. References and iterators from `pos` to @ref end(),
both included, are invalidated. Other iterators and references are not
invalidated. The relative order of remaining elements is preserved.
@note
The @ref end() iterator (which is valid but cannot be
dereferenced) cannot be used as a value for `pos`.
The @ref end() iterator (which is valid but cannot be dereferenced)
cannot be used as a value for `pos`.
@par Complexity
Linear in @ref size().
@ -1311,7 +1300,7 @@ public:
@throw `boost::system::system_error` if no such element exists.
*/
/* @{ */
/** @{ */
inline
value&
at(string_view key) &;
@ -1323,7 +1312,7 @@ public:
inline
value const&
at(string_view key) const&;
/* @} */
/** @} */
/** Access or insert the specified element

4
include/boost/json/parse.hpp
View File

@ -62,7 +62,7 @@ BOOST_JSON_DECL
value
parse(
string_view s,
system::error_code& ec,
boost::system::error_code& ec,
storage_ptr sp = {},
parse_options const& opt = {});
@ -156,7 +156,7 @@ BOOST_JSON_DECL
value
parse(
std::istream& is,
system::error_code& ec,
boost::system::error_code& ec,
storage_ptr sp = {},
parse_options const& opt = {});

4
include/boost/json/parse_into.hpp
View File

@ -76,7 +76,7 @@ void
parse_into(
V& v,
string_view sv,
system::error_code& ec,
boost::system::error_code& ec,
parse_options const& opt = {} );
template<class V>
@ -161,7 +161,7 @@ void
parse_into(
V& v,
std::istream& is,
system::error_code& ec,
boost::system::error_code& ec,
parse_options const& opt = {} );
template<class V>

8
include/boost/json/parser.hpp
View File

@ -463,7 +463,7 @@ public:
write_some(
char const* data,
std::size_t size,
system::error_code& ec);
boost::system::error_code& ec);
BOOST_JSON_DECL
std::size_t
@ -557,7 +557,7 @@ public:
std::size_t
write_some(
string_view s,
system::error_code& ec)
boost::system::error_code& ec)
{
return write_some(
s.data(), s.size(), ec);
@ -658,7 +658,7 @@ public:
write(
char const* data,
std::size_t size,
system::error_code& ec);
boost::system::error_code& ec);
BOOST_JSON_DECL
std::size_t
@ -746,7 +746,7 @@ public:
std::size_t
write(
string_view s,
system::error_code& ec)
boost::system::error_code& ec)
{
return write(
s.data(), s.size(), ec);

8
include/boost/json/storage_ptr.hpp
View File

@ -224,7 +224,7 @@ public:
*/
template<class T>
storage_ptr(
container::pmr::polymorphic_allocator<T> const& alloc) noexcept
boost::container::pmr::polymorphic_allocator<T> const& alloc) noexcept
: i_(reinterpret_cast<std::uintptr_t>(
alloc.resource()))
{
@ -407,7 +407,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
container::pmr::memory_resource*
boost::container::pmr::memory_resource*
get() const noexcept
{
if(i_ != 0)
@ -427,7 +427,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
container::pmr::memory_resource*
boost::container::pmr::memory_resource*
operator->() const noexcept
{
return get();
@ -446,7 +446,7 @@ public:
No-throw guarantee.
*/
container::pmr::memory_resource&
boost::container::pmr::memory_resource&
operator*() const noexcept
{
return *get();

24
include/boost/json/stream_parser.hpp
View File

@ -509,7 +509,7 @@ public:
@param ec Set to the error, if any occurred.
*/
/** @{ */
/** @{ */
BOOST_JSON_DECL
std::size_t
write_some(
@ -523,7 +523,7 @@ public:
char const* data,
std::size_t size,
std::error_code& ec);
/** @} */
/** @} */
/** Parse a buffer containing all or part of a complete JSON text.
@ -623,7 +623,7 @@ public:
@param ec Set to the error, if any occurred.
*/
/** @{ */
/** @{ */
std::size_t
write_some(
string_view s,
@ -641,7 +641,7 @@ public:
return write_some(
s.data(), s.size(), ec);
}
/** @} */
/** @} */
/** Parse a buffer containing all or part of a complete JSON text.
@ -740,13 +740,13 @@ public:
@param ec Set to the error, if any occurred.
*/
/** @{ */
/** @{ */
BOOST_JSON_DECL
std::size_t
write(
char const* data,
std::size_t size,
system::error_code& ec);
boost::system::error_code& ec);
BOOST_JSON_DECL
std::size_t
@ -754,7 +754,7 @@ public:
char const* data,
std::size_t size,
std::error_code& ec);
/** @} */
/** @} */
/** Parse a buffer containing all or part of a complete JSON text.
@ -848,7 +848,7 @@ public:
@param ec Set to the error, if any occurred.
*/
/** @{ */
/** @{ */
std::size_t
write(
string_view s,
@ -866,7 +866,7 @@ public:
return write(
s.data(), s.size(), ec);
}
/** @} */
/** @} */
/** Parse a buffer containing all or part of a complete JSON text.
@ -950,15 +950,15 @@ public:
@param ec Set to the error, if any occurred.
*/
/** @{ */
/** @{ */
BOOST_JSON_DECL
void
finish(system::error_code& ec);
finish(boost::system::error_code& ec);
BOOST_JSON_DECL
void
finish(std::error_code& ec);
/** @} */
/** @} */
/** Indicate the end of JSON input.

18
include/boost/json/string.hpp
View File

@ -84,16 +84,9 @@ class string
storage_ptr sp);
public:
/** Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
This type is a `boost::container::pmr::polymorphic_allocator<value>`.
*/
#ifdef BOOST_JSON_DOCS
using allocator_type = __see_below__;
#else
// VFALCO doc toolchain renders this incorrectly
using allocator_type = container::pmr::polymorphic_allocator<value>;
#endif
/// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
using allocator_type
= boost::container::pmr::polymorphic_allocator<value>;
/// The type of a character
using value_type = char;
@ -1107,7 +1100,7 @@ public:
return impl_.data();
}
/** Convert to a `string_view` referring to the string.
/** Convert to a @ref string_view referring to the string.
Returns a string view to the
underlying character string. The size of the view
@ -2240,8 +2233,7 @@ public:
Returns a view of the whole string.
@par Exception Safety
`noexcept`
No-throw guarantee.
@return `string_view(this->data(), this->size())`.
*/

67
include/boost/json/value.hpp
View File

@ -111,16 +111,8 @@ class value
}
public:
/** Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
This type is a `boost::container::pmr::polymorphic_allocator<value>`.
*/
#ifdef BOOST_JSON_DOCS
using allocator_type = __see_below__;
#else
// VFALCO doc toolchain renders this incorrectly
using allocator_type = container::pmr::polymorphic_allocator<value>;
#endif
/// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
using allocator_type = boost::container::pmr::polymorphic_allocator<value>;
/** Destructor.
@ -2385,7 +2377,7 @@ public:
! std::is_same<T, bool>::value,
T>::type
#endif
to_number(system::error_code& ec) const noexcept
to_number(boost::system::error_code& ec) const noexcept
{
error e;
auto result = to_number<T>(e);
@ -2524,7 +2516,7 @@ public:
@throw `boost::system::system_error` `! this->is_object()`.
*/
/* @{ */
/** @{ */
object&
as_object() &
{
@ -2546,7 +2538,7 @@ public:
BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
detail::throw_system_error( error::not_object, &loc );
}
/* @} */
/** @} */
/** Return a reference to the underlying @ref array, or throw an exception.
@ -2562,7 +2554,7 @@ public:
@throw `boost::system::system_error` `! this->is_array()`.
*/
/* @{ */
/** @{ */
array&
as_array() &
{
@ -2584,7 +2576,7 @@ public:
BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
detail::throw_system_error( error::not_array, &loc );
}
/* @} */
/** @} */
/** Return a reference to the underlying `string`, or throw an exception.
@ -2600,7 +2592,7 @@ public:
@throw `boost::system::system_error` `! this->is_string()`.
*/
/* @{ */
/** @{ */
string&
as_string() &
{
@ -2622,7 +2614,7 @@ public:
BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
detail::throw_system_error( error::not_string, &loc );
}
/* @} */
/** @} */
/** Return a reference to the underlying `std::int64_t`, or throw an exception.
@ -2875,7 +2867,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
/* @{ */
/** @{ */
object&
get_object() & noexcept
{
@ -2896,7 +2888,7 @@ public:
BOOST_ASSERT(is_object());
return obj_;
}
/* @} */
/** @} */
/** Return a reference to the underlying `array`, without checking.
@ -2915,7 +2907,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
/* @{ */
/** @{ */
array&
get_array() & noexcept
{
@ -2936,7 +2928,7 @@ public:
BOOST_ASSERT(is_array());
return arr_;
}
/* @} */
/** @} */
/** Return a reference to the underlying `string`, without checking.
@ -2955,7 +2947,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
/* @{ */
/** @{ */
string&
get_string() & noexcept
{
@ -2976,7 +2968,7 @@ public:
BOOST_ASSERT(is_string());
return str_;
}
/* @} */
/** @} */
/** Return a reference to the underlying `std::int64_t`, without checking.
@ -3188,7 +3180,7 @@ public:
@return `this->as_object().at( key )`.
*/
/** @{ */
/** @{ */
value&
at(string_view key) &
{
@ -3206,7 +3198,7 @@ public:
{
return as_object().at(key);
}
/** @} */
/** @} */
/** Access an element, with bounds checking.
@ -3224,7 +3216,7 @@ public:
@return `this->as_array().at( pos )`.
*/
/** @{ */
/** @{ */
value &
at(std::size_t pos) &
{
@ -3242,7 +3234,7 @@ public:
{
return as_array().at(pos);
}
/** @} */
/** @} */
/** Access an element via JSON Pointer.
@ -3265,7 +3257,7 @@ public:
<a href="https://datatracker.ietf.org/doc/html/rfc6901">
RFC 6901 - JavaScript Object Notation (JSON) Pointer</a>
*/
/** @{ */
/** @{ */
BOOST_JSON_DECL
value const&
at_pointer(string_view ptr) const&;
@ -3277,7 +3269,7 @@ public:
inline
value&
at_pointer(string_view ptr) &;
/** @} */
/** @} */
/** Access an element via JSON Pointer.
@ -3300,14 +3292,15 @@ public:
<a href="https://datatracker.ietf.org/doc/html/rfc6901">
RFC 6901 - JavaScript Object Notation (JSON) Pointer</a>
*/
/** @{ */
/** @{ */
BOOST_JSON_DECL
value const*
find_pointer(string_view ptr, system::error_code& ec) const noexcept;
find_pointer(
string_view ptr, boost::system::error_code& ec) const noexcept;
BOOST_JSON_DECL
value*
find_pointer(string_view ptr, system::error_code& ec) noexcept;
find_pointer(string_view ptr, boost::system::error_code& ec) noexcept;
BOOST_JSON_DECL
value const*
@ -3316,7 +3309,7 @@ public:
BOOST_JSON_DECL
value*
find_pointer(string_view ptr, std::error_code& ec) noexcept;
/** @} */
/** @} */
//------------------------------------------------------
@ -3444,7 +3437,7 @@ public:
<a href="https://datatracker.ietf.org/doc/html/rfc6901">
RFC 6901 - JavaScript Object Notation (JSON) Pointer</a>.
*/
/** @{ */
/** @{ */
BOOST_JSON_DECL
value*
set_at_pointer(
@ -3460,7 +3453,7 @@ public:
value_ref ref,
std::error_code& ec,
set_pointer_options const& opts = {} );
/** @} */
/** @} */
//------------------------------------------------------
@ -4057,7 +4050,7 @@ public:
@par Exception Safety
No-throw guarantee.
*/
/* @{ */
/** @{ */
json::value const&
value() const& noexcept
{
@ -4075,7 +4068,7 @@ public:
{
return value_;
}
/* @} */
/** @} */
private:
json::value value_;