Skip to content

Commit

Permalink
Remove unused exception subclass.
Browse files Browse the repository at this point in the history
  • Loading branch information
danpat committed Oct 23, 2017
1 parent 208e6f2 commit 9e690c9
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions include/nodejs/node_osrm_support.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,6 @@ template <> v8::Local<v8::Value> inline render(const osrm::json::Object &result)
return value;
}

struct ResultException : public std::logic_error
{
std::unique_ptr<char[]> messagebuf;

public:
ResultException(const char *code, const char *message) : std::logic_error(code)
{
messagebuf = std::make_unique<char[]>(std::strlen(message) + 1);
std::strcpy(messagebuf.get(), message);
}
ResultException(const char *code) : std::logic_error(code)
{
messagebuf = std::make_unique<char[]>(1);
messagebuf.get()[0] = 0;
}

const char *message() { return messagebuf.get(); }
};

inline void ParseResult(const osrm::Status &result_status, osrm::json::Object &result)
{
const auto code_iter = result.values.find("code");
Expand All @@ -87,14 +68,15 @@ inline void ParseResult(const osrm::Status &result_status, osrm::json::Object &r
const auto message_iter = result.values.find("message");
if (message_iter != end_iter)
{
// Concatenate the code: message so we don't lose details on errors
const auto code = code_iter->second.get<osrm::json::String>().value.c_str();
const auto message = message_iter->second.get<osrm::json::String>().value.c_str();
auto buffer =
std::make_unique<char[]>(std::strlen(code) + 2 + std::strlen(message) + 1);
std::strcpy(buffer.get(), code);
std::strcat(buffer.get(), ": ");
std::strcat(buffer.get(), message);
throw ResultException(buffer.get());
throw std::logic_error(buffer.get());
}
else
{
Expand Down

0 comments on commit 9e690c9

Please sign in to comment.