From b98d830a338e064bd47b65d4c530f0e570028848 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 1 Nov 2014 22:10:53 +0100 Subject: [PATCH] mpd: output: replace exception with assert --- src/mpdpp.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/mpdpp.h b/src/mpdpp.h index ab06d797..ac4034c9 100644 --- a/src/mpdpp.h +++ b/src/mpdpp.h @@ -159,29 +159,23 @@ struct Output unsigned id() const { - checkNonEmpty(); + assert(m_output.get() != nullptr); return mpd_output_get_id(m_output.get()); } const char *name() const { - checkNonEmpty(); + assert(m_output.get() != nullptr); return mpd_output_get_name(m_output.get()); } bool enabled() const { - checkNonEmpty(); + assert(m_output.get() != nullptr); return mpd_output_get_enabled(m_output.get()); } bool empty() const { return m_output.get() == nullptr; } private: - void checkNonEmpty() const - { - if (empty()) - throw std::runtime_error("No associated mpd_output object"); - } - std::shared_ptr m_output; };