Skip to content

Commit 57b0b05

Browse files
committed
Change field order in encode_error
1 parent 54abbb7 commit 57b0b05

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

include/glaze/ext/glaze_asio.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ namespace glz
572572
{
573573
namespace repe
574574
{
575-
inline void encode_error(const error_code& ec, const std::string_view error_message, message& msg)
575+
inline void encode_error(const error_code& ec, message& msg, const std::string_view error_message = "")
576576
{
577577
msg.header.ec = ec;
578578
if (error_message.size() > (std::numeric_limits<uint32_t>::max)()) {
@@ -666,15 +666,15 @@ namespace glz
666666
header.notify(true);
667667
repe::request<Opts>(std::move(header), *request, std::forward<Params>(params)...);
668668
if (bool(request->error())) {
669-
encode_error(request->error(), "", response);
669+
encode_error(request->error(), response);
670670
return;
671671
}
672672

673673
unique_socket socket{socket_pool.get()};
674674
if (not socket) {
675675
socket.ptr.reset();
676676
(*is_connected) = false;
677-
encode_error(error_code::send_error, "", response);
677+
encode_error(error_code::send_error, response);
678678
return;
679679
}
680680

@@ -684,7 +684,7 @@ namespace glz
684684
if (bool(ec)) {
685685
socket.ptr.reset();
686686
(*is_connected) = false;
687-
encode_error(ec, "", response);
687+
encode_error(ec, response);
688688
return;
689689
}
690690
}
@@ -696,15 +696,15 @@ namespace glz
696696
header.read(true);
697697
repe::request<Opts>(std::move(header), *request);
698698
if (bool(request->error())) {
699-
encode_error(request->error(), "", response);
699+
encode_error(request->error(), response);
700700
return;
701701
}
702702

703703
unique_socket socket{socket_pool.get()};
704704
if (not socket) {
705705
socket.ptr.reset();
706706
(*is_connected) = false;
707-
encode_error(error_code::send_error, "", response);
707+
encode_error(error_code::send_error, response);
708708
return;
709709
}
710710

@@ -714,15 +714,15 @@ namespace glz
714714
if (bool(ec)) {
715715
socket.ptr.reset();
716716
(*is_connected) = false;
717-
encode_error(ec, "", response);
717+
encode_error(ec, response);
718718
return;
719719
}
720720

721721
receive_buffer(*socket, response, ec);
722722
if (bool(ec)) {
723723
socket.ptr.reset();
724724
(*is_connected) = false;
725-
encode_error(ec, "", response);
725+
encode_error(ec, response);
726726
return;
727727
}
728728
}
@@ -733,15 +733,15 @@ namespace glz
733733
auto request = message_pool->borrow();
734734
repe::request<Opts>(std::move(header), *request, std::forward<Params>(params)...);
735735
if (bool(request->error())) {
736-
encode_error(request->error(), "", response);
736+
encode_error(request->error(), response);
737737
return;
738738
}
739739

740740
unique_socket socket{socket_pool.get()};
741741
if (not socket) {
742742
socket.ptr.reset();
743743
(*is_connected) = false;
744-
encode_error(error_code::send_error, "", response);
744+
encode_error(error_code::send_error, response);
745745
return;
746746
}
747747

@@ -751,15 +751,15 @@ namespace glz
751751
if (bool(ec)) {
752752
socket.ptr.reset();
753753
(*is_connected) = false;
754-
encode_error(ec, "", response);
754+
encode_error(ec, response);
755755
return;
756756
}
757757

758758
receive_buffer(*socket, response, ec);
759759
if (bool(ec)) {
760760
socket.ptr.reset();
761761
(*is_connected) = false;
762-
encode_error(ec, "", response);
762+
encode_error(ec, response);
763763
return;
764764
}
765765
}

0 commit comments

Comments
 (0)