diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-20 18:50:29 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-20 18:50:29 +0000 |
| commit | 683029f31f0f1814c21ca65f7f113ac12b6242fb (patch) | |
| tree | 4d4adb5dcfc962c4caaebaf6b448cc8b6477a194 /src/io | |
| parent | Merge branch 'cleanups' of gitlab.com:stfacc/inkscape (diff) | |
| parent | Refactor Util::ptr_shared (diff) | |
| download | inkscape-683029f31f0f1814c21ca65f7f113ac12b6242fb.tar.gz inkscape-683029f31f0f1814c21ca65f7f113ac12b6242fb.zip | |
Merge branch 'smartpointer_refactor' of gitlab.com:jali/inkscape
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/resource.cpp | 4 | ||||
| -rw-r--r-- | src/io/resource.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/io/resource.cpp b/src/io/resource.cpp index bc6c9f7b0..c3cd9e403 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -113,10 +113,10 @@ gchar *_get_path(Domain domain, Type type, char const *filename) return path; } -Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename) +Util::ptr_shared get_path(Domain domain, Type type, char const *filename) { char *path = _get_path(domain, type, filename); - Util::ptr_shared<char> result=Util::share_string(path); + Util::ptr_shared result=Util::share_string(path); g_free(path); return result; } diff --git a/src/io/resource.h b/src/io/resource.h index d12372024..d7dd506ad 100644 --- a/src/io/resource.h +++ b/src/io/resource.h @@ -56,7 +56,7 @@ enum Domain { USER }; -Util::ptr_shared<char> get_path(Domain domain, Type type, +Util::ptr_shared get_path(Domain domain, Type type, char const *filename=NULL); Glib::ustring get_path_ustring(Domain domain, Type type, |