Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions include/boost/redis/impl/response.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@

#include <boost/assert.hpp>

#include <algorithm>

namespace boost::redis {

void consume_one(generic_response& r, system::error_code& ec)
namespace detail {

inline void consume_one_impl(generic_response& r, system::error_code& ec)
{
if (r.has_error())
return; // Nothing to consume.
Expand All @@ -38,10 +42,14 @@ void consume_one(generic_response& r, system::error_code& ec)
r.value().erase(std::cbegin(r.value()), match);
}

} // namespace detail

void consume_one(generic_response& r, system::error_code& ec) { detail::consume_one_impl(r, ec); }

void consume_one(generic_response& r)
{
system::error_code ec;
consume_one(r, ec);
detail::consume_one_impl(r, ec);
if (ec)
throw system::system_error(ec);
}
Expand Down
8 changes: 3 additions & 5 deletions include/boost/redis/response.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
#define BOOST_REDIS_RESPONSE_HPP

#include <boost/redis/adapter/result.hpp>
#include <boost/redis/resp3/flat_tree.hpp>
#include <boost/redis/resp3/node.hpp>
#include <boost/redis/resp3/tree.hpp>
#include <boost/redis/resp3/flat_tree.hpp>

#include <boost/system/error_code.hpp>

#include <string>
#include <tuple>
#include <vector>

namespace boost::redis {

Expand Down Expand Up @@ -75,15 +73,15 @@ using generic_flat_response = adapter::result<resp3::flat_tree>;
* @param r The response to modify.
* @param ec Will be populated in case of error.
*/
//BOOST_DEPRECATED("This function is not needed anymore to consume server pushes.")
BOOST_DEPRECATED("This function is not needed anymore to consume server pushes.")
void consume_one(generic_response& r, system::error_code& ec);

/**
* @brief (Deprecated) Throwing overload of `consume_one`.
*
* @param r The response to modify.
*/
//BOOST_DEPRECATED("This function is not needed anymore to consume server pushes.")
BOOST_DEPRECATED("This function is not needed anymore to consume server pushes.")
void consume_one(generic_response& r);

} // namespace boost::redis
Expand Down