diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-11-20 17:27:19 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-11-20 17:27:19 +0100 |
commit | b487d5cdd014b0268672abdd48cb31dde25a8137 (patch) | |
tree | b4ef80db56e60e33ccca2198b23bc2706ed18fe2 /glib | |
parent | accdacdb7a8f321380f8c5ddc98ca309da243f65 (diff) | |
download | glibmm-b487d5cdd014b0268672abdd48cb31dde25a8137.tar.gz |
Glib::VariantBase::cast_dynamic(): Remove noexcept(false)
noexcept(false) has the same meaning as no noexcept specification, but
Doxygen adds "noexcept" instead of "noexcept(false)" in the detailed
description of the method, which is confusing. Bug 789329
Diffstat (limited to 'glib')
-rw-r--r-- | glib/src/variant.ccg | 6 | ||||
-rw-r--r-- | glib/src/variant.hg | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg index 856fe461..998955c7 100644 --- a/glib/src/variant.ccg +++ b/glib/src/variant.ccg @@ -193,7 +193,7 @@ VariantContainerBase::get_child(VariantBase& child, gsize index) const // VariantContainerBase has no method variant_type() template <> VariantContainerBase -VariantBase::cast_dynamic<VariantContainerBase>(const VariantBase& v) noexcept(false) +VariantBase::cast_dynamic<VariantContainerBase>(const VariantBase& v) { if (!v.gobj()) return VariantContainerBase(); @@ -334,7 +334,7 @@ Variant<Glib::ustring>::get() const // See http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#g-variant-get-string template <> Variant<Glib::ustring> -VariantBase::cast_dynamic<Variant<Glib::ustring>>(const VariantBase& v) noexcept(false) +VariantBase::cast_dynamic<Variant<Glib::ustring>>(const VariantBase& v) { if (!v.gobj()) { @@ -447,7 +447,7 @@ Variant<std::string>::create(const std::string& data) // See http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#g-variant-get-string template <> Variant<std::string> -VariantBase::cast_dynamic<Variant<std::string>>(const VariantBase& v) noexcept(false) +VariantBase::cast_dynamic<Variant<std::string>>(const VariantBase& v) { if (!v.gobj()) { diff --git a/glib/src/variant.hg b/glib/src/variant.hg index 8310e19f..5a7db66f 100644 --- a/glib/src/variant.hg +++ b/glib/src/variant.hg @@ -227,7 +227,7 @@ _DEPRECATE_IFDEF_END * @throws std::bad_cast if the Variant was not of the expected type. */ template<class V_CastTo> - static V_CastTo cast_dynamic(const VariantBase& v) noexcept(false); + static V_CastTo cast_dynamic(const VariantBase& v); _IGNORE(g_variant_dict_new) @@ -273,7 +273,6 @@ private: template<class V_CastTo> V_CastTo VariantBase::cast_dynamic(const VariantBase& v) -noexcept(false) { if(!(v.gobj())) { @@ -434,8 +433,7 @@ protected: }; template<> -VariantContainerBase VariantBase::cast_dynamic<VariantContainerBase>(const VariantBase& v) -noexcept(false); +VariantContainerBase VariantBase::cast_dynamic<VariantContainerBase>(const VariantBase& v); /** Template class used for the specialization of the Variant<> classes. * @newin{2,28} @@ -595,8 +593,7 @@ public: //TODO: When we can break ABI, remove this template specialization. template<> -Variant<Glib::ustring> VariantBase::cast_dynamic< Variant<Glib::ustring> >(const VariantBase& v) -noexcept(false); +Variant<Glib::ustring> VariantBase::cast_dynamic< Variant<Glib::ustring> >(const VariantBase& v); /** Specialization of Variant containing a Glib::DBusObjectPathString, * for variants of type object path. @@ -736,8 +733,7 @@ public: //TODO: When we can break ABI, remove this template specialization. template<> -Variant<std::string> VariantBase::cast_dynamic< Variant<std::string> >(const VariantBase& v) -noexcept(false); +Variant<std::string> VariantBase::cast_dynamic< Variant<std::string> >(const VariantBase& v); /** Specialization of Variant containing a dictionary entry. See also * Variant< std::map<K, V> >. |