summaryrefslogtreecommitdiffhomepage
path: root/spline/spline.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-05-06 13:23:44 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-05-10 11:19:22 +0200
commit03c5a15199b34b564314ac222d51ab687fc97a93 (patch)
treec130aa8785dc273090dbe0f3fa04e5055d851483 /spline/spline.cpp
parent632cd5bf7778cb9062633f8d27ecd6aadcaa5d28 (diff)
get rid of the silly mem -> shared_ptr alias
Diffstat (limited to 'spline/spline.cpp')
-rw-r--r--spline/spline.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/spline/spline.cpp b/spline/spline.cpp
index 58703e02..c1f09db8 100644
--- a/spline/spline.cpp
+++ b/spline/spline.cpp
@@ -428,13 +428,13 @@ void spline::recompute()
}
// the return value is only safe to use with no spline::set_bundle calls
-mem<spline::settings> spline::get_settings()
+std::shared_ptr<spline::settings> spline::get_settings()
{
QMutexLocker foo(&_mutex);
return s;
}
-mem<const spline::settings> spline::get_settings() const
+std::shared_ptr<const spline::settings> spline::get_settings() const
{
QMutexLocker foo(&_mutex);
return s;