Skip to content

Commit

Permalink
Better fix for #16
Browse files Browse the repository at this point in the history
(cherry picked from commit 28ade41)
  • Loading branch information
alexey-milovidov authored and nikitamikhaylov committed Oct 15, 2024
1 parent 3264fda commit 20794fe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cpp/src/arrow/util/logging.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class CerrLog {
public:
explicit CerrLog(ArrowLogLevel severity) : severity_(severity), has_logged_(false) {}

virtual ~CerrLog() noexcept(false) {
virtual ~CerrLog() {
if (has_logged_) {
stream << std::endl;
}
Expand Down Expand Up @@ -246,7 +246,7 @@ std::ostream& ArrowLog::Stream() {

bool ArrowLog::IsEnabled() const { return is_enabled_; }

ArrowLog::~ArrowLog() noexcept(false) {
ArrowLog::~ArrowLog() {
if (logging_provider_ != nullptr) {
delete reinterpret_cast<LoggingProvider*>(logging_provider_);
logging_provider_ = nullptr;
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/util/logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ enum class ArrowLogLevel : int {
// This is also a null log which does not output anything.
class ARROW_EXPORT ArrowLogBase {
public:
virtual ~ArrowLogBase() noexcept(false) {}
virtual ~ArrowLogBase() {}

virtual bool IsEnabled() const { return false; }

Expand All @@ -176,7 +176,7 @@ class ARROW_EXPORT ArrowLogBase {
class ARROW_EXPORT ArrowLog : public ArrowLogBase {
public:
ArrowLog(const char* file_name, int line_number, ArrowLogLevel severity);
~ArrowLog() noexcept(false) override;
~ArrowLog() override;

/// Return whether or not current logging instance is enabled.
///
Expand Down

0 comments on commit 20794fe

Please sign in to comment.