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/ConnectionImpl.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/ConnectionImpl.hpp')
-rw-r--r-- | src/server/ConnectionImpl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/ConnectionImpl.hpp b/src/server/ConnectionImpl.hpp index ce30eaa4..5a04d81b 100644 --- a/src/server/ConnectionImpl.hpp +++ b/src/server/ConnectionImpl.hpp @@ -19,10 +19,10 @@ #define INGEN_ENGINE_CONNECTIONIMPL_HPP #include <cstdlib> +#include <boost/intrusive_ptr.hpp> #include <boost/utility.hpp> #include "raul/log.hpp" #include "raul/Deletable.hpp" -#include "raul/IntrusivePtr.hpp" #include "ingen/PortType.hpp" #include "ingen/Connection.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" @@ -67,7 +67,7 @@ public: void queue(Context& context); void get_sources(Context& context, uint32_t voice, - IntrusivePtr<Buffer>* srcs, uint32_t max_num_srcs, uint32_t& num_srcs); + boost::intrusive_ptr<Buffer>* srcs, uint32_t max_num_srcs, uint32_t& num_srcs); /** Get the buffer for a particular voice. * A Connection is smart - it knows the destination port requesting the |