Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Remove more vestiges of pre-C++11 Mac library workarounds

Browse Source
This commit is contained in:
Paul Licameli 2018-09-14 14:11:00 -04:00
parent fe81760522
commit 20947efecf
2 changed files with 4 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/MemoryX.h
View File

@ -8,10 +8,6 @@
#define safenew new
#endif
// Conditional compilation switch indicating whether to rely on
// std:: containers knowing about rvalue references
#undef __AUDACITY_OLD_STD__
#include <functional>
@ -322,83 +318,6 @@ static char*THIS_FILE = __FILE__;
#endif
#endif
// Frequently, we need to use a vector or list of unique_ptr if we can, but default
// to shared_ptr if we can't (because containers know how to copy elements only,
// not move them).
#ifdef __AUDACITY_OLD_STD__
template<typename T> using movable_ptr = std::shared_ptr<T>;
template<typename T, typename Deleter> using movable_ptr_with_deleter_base = std::shared_ptr<T>;
#else
template<typename T> using movable_ptr = std::unique_ptr<T>;
template<typename T, typename Deleter> using movable_ptr_with_deleter_base = std::unique_ptr<T, Deleter>;
#endif
template<typename T, typename... Args>
inline movable_ptr<T> make_movable(Args&&... args)
{
return std::
#ifdef __AUDACITY_OLD_STD__
make_shared
#else
make_unique
#endif
<T>(std::forward<Args>(args)...);
}
template<typename T, typename Deleter> class movable_ptr_with_deleter
: public movable_ptr_with_deleter_base < T, Deleter >
{
public:
// Do not expose a constructor that takes only a pointer without deleter
// That is important when implemented with shared_ptr
movable_ptr_with_deleter() {};
movable_ptr_with_deleter(T* p, const Deleter &d)
: movable_ptr_with_deleter_base<T, Deleter>( p, d ) {}
#ifdef __AUDACITY_OLD_STD__
// copy
movable_ptr_with_deleter(const movable_ptr_with_deleter &that)
: movable_ptr_with_deleter_base < T, Deleter > ( that )
{
}
movable_ptr_with_deleter &operator= (const movable_ptr_with_deleter& that)
{
if (this != &that) {
((movable_ptr_with_deleter_base<T, Deleter>&)(*this)) =
that;
}
return *this;
}
#else
// move
movable_ptr_with_deleter(movable_ptr_with_deleter &&that)
: movable_ptr_with_deleter_base < T, Deleter > ( std::move(that) )
{
}
movable_ptr_with_deleter &operator= (movable_ptr_with_deleter&& that)
{
if (this != &that) {
((movable_ptr_with_deleter_base<T, Deleter>&)(*this)) =
std::move(that);
}
return *this;
}
#endif
};
template<typename T, typename Deleter, typename... Args>
inline movable_ptr_with_deleter<T, Deleter>
make_movable_with_deleter(const Deleter &d, Args&&... args)
{
return movable_ptr_with_deleter<T, Deleter>(safenew T(std::forward<Args>(args)...), d);
}
/*
* A deleter for pointers obtained with malloc
*/

8
src/Registrar.h
View File

@ -41,10 +41,10 @@ public:
bool bWantsCommands;
bool bWantsCommandTypes;
bool bWantsEffects;
virtual void AddCommandType(movable_ptr<CommandDefinitionInterface> && WXUNUSED(comDef) ){;};
virtual void AddCommand(movable_ptr<AudacityCommand> && WXUNUSED(command) ){;};
virtual void AddModule(movable_ptr<LoadableModule> && WXUNUSED(module) ){;};
virtual void AddEffect(movable_ptr<Effect> && WXUNUSED(effect) ){;};
virtual void AddCommandType(std::unique_ptr<CommandDefinitionInterface> && WXUNUSED(comDef) ){;};
virtual void AddCommand(std::unique_ptr<AudacityCommand> && WXUNUSED(command) ){;};
virtual void AddModule(std::unique_ptr<LoadableModule> && WXUNUSED(module) ){;};
virtual void AddEffect(std::unique_ptr<Effect> && WXUNUSED(effect) ){;};
};
#endif