summaryrefslogtreecommitdiffhomepage
path: root/options
diff options
context:
space:
mode:
Diffstat (limited to 'options')
-rw-r--r--options/globals.hpp6
-rw-r--r--options/group.hpp2
-rw-r--r--options/value.hpp12
3 files changed, 10 insertions, 10 deletions
diff --git a/options/globals.hpp b/options/globals.hpp
index 5b392055..ae7f8e4d 100644
--- a/options/globals.hpp
+++ b/options/globals.hpp
@@ -29,12 +29,12 @@ struct OTR_OPTIONS_EXPORT saver_ final
{
ini_ctx& ctx;
- cc_noinline ~saver_();
- explicit cc_noinline saver_(ini_ctx& ini);
+ never_inline ~saver_();
+ explicit never_inline saver_(ini_ctx& ini);
};
template<typename F>
-cc_noinline
+never_inline
auto with_settings_object_(ini_ctx& ini, F&& fun)
{
saver_ saver { ini };
diff --git a/options/group.hpp b/options/group.hpp
index 76bb939b..45e9353c 100644
--- a/options/group.hpp
+++ b/options/group.hpp
@@ -31,7 +31,7 @@ namespace options::detail {
void put(const QString& s, const QVariant& d);
bool contains(const QString& s) const;
- cc_noinline QVariant get_variant(const QString& name) const;
+ never_inline QVariant get_variant(const QString& name) const;
};
} // ns options::detail
diff --git a/options/value.hpp b/options/value.hpp
index 3478e842..18a5ae9b 100644
--- a/options/value.hpp
+++ b/options/value.hpp
@@ -42,7 +42,7 @@ class value final : public value_
const t def;
using traits = detail::value_traits<t>;
- cc_noinline
+ never_inline
auto get() const noexcept
{
if (!b->contains(self_name))
@@ -56,7 +56,7 @@ class value final : public value_
return traits::pass_value(traits::value_with_default(traits::value_from_qvariant(variant), def));
}
- cc_noinline
+ never_inline
void store_variant(QVariant&& value) noexcept override
{
if (traits::is_equal(get(), traits::value_from_qvariant(value)))
@@ -68,7 +68,7 @@ class value final : public value_
b->store_kv(self_name, traits::qvariant_from_value(def));
}
- cc_noinline
+ never_inline
void store_variant(const QVariant& value) noexcept override
{
QVariant copy{value};
@@ -136,15 +136,15 @@ public:
operator t() const { return get(); }
template<typename u>
- explicit cc_forceinline operator u() const { return to<u>(); }
+ explicit force_inline operator u() const { return to<u>(); }
auto operator->() const noexcept
{
return detail::dereference_wrapper{get()};
}
- cc_forceinline auto operator()() const noexcept { return get(); }
- cc_forceinline auto operator*() const noexcept { return get(); }
+ force_inline auto operator()() const noexcept { return get(); }
+ force_inline auto operator*() const noexcept { return get(); }
template<typename u>
u to() const noexcept