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/NodeImpl.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/NodeImpl.hpp')
| -rw-r--r-- | src/server/NodeImpl.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp index 3263727a..0009316e 100644 --- a/src/server/NodeImpl.hpp +++ b/src/server/NodeImpl.hpp @@ -19,9 +19,9 @@ #define INGEN_ENGINE_NODEIMPL_HPP #include <string> +#include <boost/intrusive_ptr.hpp> #include "raul/Array.hpp" #include "raul/AtomicInt.hpp" -#include "raul/IntrusivePtr.hpp" #include "raul/Semaphore.hpp" #include "ingen/Node.hpp" #include "GraphObjectImpl.hpp" @@ -140,10 +140,10 @@ public: /** Set the buffer of a port to a given buffer (e.g. connect plugin to buffer) */ virtual void set_port_buffer( - uint32_t voice, - uint32_t port_num, - IntrusivePtr<Buffer> buf, - SampleCount offset); + uint32_t voice, + uint32_t port_num, + boost::intrusive_ptr<Buffer> buf, + SampleCount offset); virtual Port* port(uint32_t index) const; virtual PortImpl* port_impl(uint32_t index) const { return (*_ports)[index]; } |