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/events | |
| 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/events')
| -rw-r--r-- | src/server/events/RequestMetadata.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/events/RequestMetadata.cpp b/src/server/events/RequestMetadata.cpp index 156fb51d..597a831b 100644 --- a/src/server/events/RequestMetadata.cpp +++ b/src/server/events/RequestMetadata.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "raul/IntrusivePtr.hpp" +#include <boost/intrusive_ptr.hpp> #include "ingen/ClientInterface.hpp" #include "events/RequestMetadata.hpp" #include "shared/LV2Atom.hpp" @@ -89,11 +89,13 @@ RequestMetadata::execute(ProcessContext& context) if (_special_type == PORT_VALUE) { PortImpl* port = dynamic_cast<PortImpl*>(_resource); if (port) { - IntrusivePtr<AudioBuffer> abuf = PtrCast<AudioBuffer>(port->buffer(0)); + boost::intrusive_ptr<AudioBuffer> abuf = + boost::dynamic_pointer_cast<AudioBuffer>(port->buffer(0)); if (abuf) { _value = abuf->value_at(0); } else { - IntrusivePtr<ObjectBuffer> obuf = PtrCast<ObjectBuffer>(port->buffer(0)); + boost::intrusive_ptr<ObjectBuffer> obuf = + boost::dynamic_pointer_cast<ObjectBuffer>(port->buffer(0)); if (obuf) { Ingen::Shared::LV2Atom::to_atom(*_engine.world()->uris().get(), obuf->atom(), |