summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
Diffstat (limited to 'ingen')
-rw-r--r--ingen/DataAccess.hpp3
-rw-r--r--ingen/types.hpp22
2 files changed, 2 insertions, 23 deletions
diff --git a/ingen/DataAccess.hpp b/ingen/DataAccess.hpp
index 79bb84eb..13b5ac47 100644
--- a/ingen/DataAccess.hpp
+++ b/ingen/DataAccess.hpp
@@ -27,6 +27,7 @@
#include "lv2/data-access/data-access.h"
#include <cstdlib>
+#include <memory>
#include <utility>
namespace ingen {
@@ -57,7 +58,7 @@ struct DataAccess : public ingen::LV2Features::Feature
data->data_access = desc->extension_data;
- return make_shared<LV2_Feature>(
+ return std::make_shared<LV2_Feature>(
LV2_Feature{"http://lv2plug.in/ns/ext/data-access", data});
}
};
diff --git a/ingen/types.hpp b/ingen/types.hpp
index b6461799..2962d16a 100644
--- a/ingen/types.hpp
+++ b/ingen/types.hpp
@@ -42,21 +42,6 @@ using WPtr = std::weak_ptr<T>;
template <class T>
using MPtr = Raul::managed_ptr<T>;
-template<class T, class U>
-SPtr<T> static_ptr_cast(const SPtr<U>& r) {
- return std::static_pointer_cast<T>(r);
-}
-
-template<class T, class U>
-SPtr<T> dynamic_ptr_cast(const SPtr<U>& r) {
- return std::dynamic_pointer_cast<T>(r);
-}
-
-template<class T, class U>
-SPtr<T> const_ptr_cast(const SPtr<U>& r) {
- return std::const_pointer_cast<T>(r);
-}
-
template <typename T, typename... Args>
std::unique_ptr<T>
make_unique(Args&&... args)
@@ -64,13 +49,6 @@ make_unique(Args&&... args)
return std::unique_ptr<T>{new T{std::forward<Args>(args)...}};
}
-template <typename T, typename... Args>
-std::shared_ptr<T>
-make_shared(Args&&... args)
-{
- return std::make_shared<T>(std::forward<Args>(args)...);
-}
-
} // namespace ingen
#endif // INGEN_TYPES_HPP