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: 6 additions & 6 deletions src/bsoncxx/lib/bsoncxx/v1/exception.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ std::error_category const& source_error_category() {
return "bsoncxx::v1::source_errc";
}

std::string message(int e) const noexcept override {
std::string message(int v) const noexcept override {
using code = v1::source_errc;

switch (static_cast<code>(e)) {
switch (static_cast<code>(v)) {
case code::zero:
return "zero";
case code::bsoncxx:
return "bsoncxx";
case code::bson:
return "bson";
default:
return "unknown: " + std::to_string(e);
return std::string(this->name()) + ':' + std::to_string(v);
}
}
};
Expand All @@ -57,18 +57,18 @@ std::error_category const& type_error_category() {
return "bsoncxx::v1::type_errc";
}

std::string message(int e) const noexcept override {
std::string message(int v) const noexcept override {
using code = v1::type_errc;

switch (static_cast<code>(e)) {
switch (static_cast<code>(v)) {
case code::zero:
return "zero";
case code::invalid_argument:
return "invalid argument";
case code::runtime_error:
return "runtime error";
default:
return "unknown: " + std::to_string(e);
return std::string(this->name()) + ':' + std::to_string(v);
}
}
};
Expand Down
8 changes: 4 additions & 4 deletions src/bsoncxx/test/v1/exception.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ TEST_CASE("source", "[bsoncxx][v1][error]") {
}

SECTION("message") {
CHECK(c.message(-1) == "unknown: -1");
CHECK(c.message(-1) == "bsoncxx::v1::source_errc:-1");
CHECK(c.message(0) == "zero");
CHECK(c.message(1) == "bsoncxx");
CHECK(c.message(2) == "bson");
CHECK(c.message(3) == "unknown: 3");
CHECK(c.message(3) == "bsoncxx::v1::source_errc:3");
}
}

Expand All @@ -47,11 +47,11 @@ TEST_CASE("type", "[bsoncxx][v1][error]") {
}

SECTION("message") {
CHECK(c.message(-1) == "unknown: -1");
CHECK(c.message(-1) == "bsoncxx::v1::type_errc:-1");
CHECK(c.message(0) == "zero");
CHECK(c.message(1) == "invalid argument");
CHECK(c.message(2) == "runtime error");
CHECK(c.message(3) == "unknown: 3");
CHECK(c.message(3) == "bsoncxx::v1::type_errc:3");
}
}

Expand Down