From 81b1a4f05c228fdbec0d534a8f3ef3e680f88a40 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 10 Oct 2015 21:43:54 +0000 Subject: [PATCH] Fix non-virtual destructor and missing return value (fixes "illegal instruction" under FreeBSD) --- libgrive/src/base/State.cc | 1 + libgrive/src/util/log/Log.hh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libgrive/src/base/State.cc b/libgrive/src/base/State.cc index 7b64fb4..fed5f15 100644 --- a/libgrive/src/base/State.cc +++ b/libgrive/src/base/State.cc @@ -192,6 +192,7 @@ bool State::Update( const Entry& e ) return true; } m_res.Update( res, e, m_last_change ) ; + return true; } else if ( Resource *parent = m_res.FindByHref( e.ParentHref() ) ) { diff --git a/libgrive/src/util/log/Log.hh b/libgrive/src/util/log/Log.hh index 0d43adb..9646042 100644 --- a/libgrive/src/util/log/Log.hh +++ b/libgrive/src/util/log/Log.hh @@ -66,7 +66,7 @@ public : virtual bool IsEnabled( log::Serverity s ) const = 0 ; static LogBase* Inst( std::auto_ptr log = std::auto_ptr() ) ; - ~LogBase() ; + virtual ~LogBase() ; protected : LogBase() ;