diff options
author | David Robillard <d@drobilla.net> | 2011-05-23 20:20:17 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-05-23 20:20:17 +0000 |
commit | 95aff00802baf393cbabfcb05198ffc5f9979460 (patch) | |
tree | e743d0f3c5b1179cca91ea1a63e6ac77f9ab90f2 /src/server/mix.hpp | |
parent | 2f86a3e8fd1e848375981ec62bbf600885b1f841 (diff) | |
download | ingen-95aff00802baf393cbabfcb05198ffc5f9979460.tar.gz ingen-95aff00802baf393cbabfcb05198ffc5f9979460.tar.bz2 ingen-95aff00802baf393cbabfcb05198ffc5f9979460.zip |
Apply patch from pgiblox in ticket #694 to fix compilation without Raul::IntrusivePtr:
"Since Raul::IntrusivePtr was removed, ingen_server no longer compiles. We could either add another #define for IntrusivePtr, or just use boost::intrusive_ptr directly. Going with the direct approach since server seems to use boost::shared_ptr directly as well."
I would like easy portability to c++0x pointers, but unfortunately there is no intrusive_ptr there... it's an easy search/replace anyway, so this will do for now.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3307 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/mix.hpp')
-rw-r--r-- | src/server/mix.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/mix.hpp b/src/server/mix.hpp index 4b062ed9..79b02477 100644 --- a/src/server/mix.hpp +++ b/src/server/mix.hpp @@ -18,6 +18,7 @@ #ifndef INGEN_ENGINE_MIX_HPP #define INGEN_ENGINE_MIX_HPP +#include <boost/intrusive_ptr.hpp> #include "raul/log.hpp" #include "ingen/PortType.hpp" #include "Buffer.hpp" @@ -29,7 +30,7 @@ namespace Ingen { namespace Server { inline void -mix(Context& context, Buffer* dst, const IntrusivePtr<Buffer>* srcs, uint32_t num_srcs) +mix(Context& context, Buffer* dst, const boost::intrusive_ptr<Buffer>* srcs, uint32_t num_srcs) { using Ingen::PortType; switch (dst->type().symbol()) { |