diff options
author | Mathias Stearn <mathias@10gen.com> | 2017-10-24 12:27:15 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2017-11-02 14:25:21 -0400 |
commit | a963b8641cf2ab2cd0ccbbde04993a8224dcf52a (patch) | |
tree | f976216a9b16d32f277d598db65b2fcd4ca43e9d /src/mongo/executor | |
parent | d244eadffa8eb5aa714e3e881922c19532e1bd8b (diff) | |
download | mongo-a963b8641cf2ab2cd0ccbbde04993a8224dcf52a.tar.gz |
SERVER-31629 Replace ErrorCodes::fromInt() with ErrorCodes::Error()
No reason to have two ways to express the same thing, and we can't get rid of
ErrorCodes::Error().
Diffstat (limited to 'src/mongo/executor')
-rw-r--r-- | src/mongo/executor/network_interface_asio_command.cpp | 2 | ||||
-rw-r--r-- | src/mongo/executor/network_interface_asio_integration_fixture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/executor/network_interface_asio_command.cpp b/src/mongo/executor/network_interface_asio_command.cpp index a09b45bc9d1..119115e50e2 100644 --- a/src/mongo/executor/network_interface_asio_command.cpp +++ b/src/mongo/executor/network_interface_asio_command.cpp @@ -271,7 +271,7 @@ void NetworkInterfaceASIO::_completedOpCallback(AsyncOp* op) { void NetworkInterfaceASIO::_networkErrorCallback(AsyncOp* op, const std::error_code& ec) { ErrorCodes::Error errorCode = (ec.category() == mongoErrorCategory()) - ? ErrorCodes::fromInt(ec.value()) + ? ErrorCodes::Error(ec.value()) : ErrorCodes::HostUnreachable; _completeOperation(op, {errorCode, ec.message(), Milliseconds(now() - op->_start)}); } diff --git a/src/mongo/executor/network_interface_asio_integration_fixture.cpp b/src/mongo/executor/network_interface_asio_integration_fixture.cpp index 718904b3acb..0a9d8cff01b 100644 --- a/src/mongo/executor/network_interface_asio_integration_fixture.cpp +++ b/src/mongo/executor/network_interface_asio_integration_fixture.cpp @@ -154,7 +154,7 @@ void NetworkInterfaceASIOIntegrationFixture::assertWriteError(StringData db, ASSERT_OK(getStatusFromCommandResult(res.data)); ASSERT(res.data["writeErrors"]); auto firstWriteError = res.data["writeErrors"].embeddedObject().firstElement().embeddedObject(); - Status writeErrorStatus(ErrorCodes::fromInt(firstWriteError.getIntField("code")), + Status writeErrorStatus(ErrorCodes::Error(firstWriteError.getIntField("code")), firstWriteError.getStringField("errmsg")); ASSERT_EQ(reason, writeErrorStatus); } |