use shared_ptr and make dtors override = default

viamrobotics · Jan 7, 2025 · 1b67b11 · 1b67b11
1 parent 546d782
commit 1b67b11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/viam/sdk/common/exception.cpp b/src/viam/sdk/common/exception.cpp
@@ -10,8 +10,6 @@ Exception::Exception(ErrorCondition condition, const std::string& what)
 
 Exception::Exception(const std::string& what) : Exception(ErrorCondition::k_general, what) {};
 
-Exception::~Exception() = default;
-
 const std::error_condition& Exception::condition() const noexcept {
     return condition_;
 };
@@ -49,9 +47,7 @@ std::error_condition make_error_condition(ErrorCondition e) {
 
 GRPCException::GRPCException(const grpc::Status* status)
     : Exception(ErrorCondition::k_grpc, status->error_message()),
-      status_(std::make_unique<grpc::Status>(*status)) {}
-
-GRPCException::~GRPCException() = default;
+      status_(std::make_shared<grpc::Status>(*status)) {}
 
 const grpc::Status* GRPCException::status() const noexcept {
     return status_.get();

diff --git a/src/viam/sdk/common/exception.hpp b/src/viam/sdk/common/exception.hpp
@@ -42,7 +42,8 @@ class Exception : public std::runtime_error {
    public:
     explicit Exception(ErrorCondition condition, const std::string& what);
     explicit Exception(const std::string& what);
-    virtual ~Exception();
+
+    ~Exception() override = default;
 
     const std::error_condition& condition() const noexcept;
 
@@ -56,12 +57,12 @@ class Exception : public std::runtime_error {
 class GRPCException : public Exception {
    public:
     explicit GRPCException(const grpc::Status* status);
-    ~GRPCException();
+    ~GRPCException() override = default;
 
     const grpc::Status* status() const noexcept;
 
    private:
-    std::unique_ptr<grpc::Status> status_;
+    std::shared_ptr<grpc::Status> status_;
 };
 
 }  // namespace sdk