diff options
| author | David Robillard <d@drobilla.net> | 2012-07-30 23:22:44 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-07-30 23:22:44 +0000 |
| commit | 9088edb2534a616b757197662d77abcb0291470b (patch) | |
| tree | fc3c86d6a7af39642768d4b864dd38438f9a2e48 /src/server/GraphObjectImpl.hpp | |
| parent | 0e1bf6ddfc77866ff6477a3f394c030c2a5e1b39 (diff) | |
| download | ingen-9088edb2534a616b757197662d77abcb0291470b.tar.gz ingen-9088edb2534a616b757197662d77abcb0291470b.tar.bz2 ingen-9088edb2534a616b757197662d77abcb0291470b.zip | |
Merge Resource and ResourceImpl, eliminating more virtual inheritance.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4577 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/GraphObjectImpl.hpp')
| -rw-r--r-- | src/server/GraphObjectImpl.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/GraphObjectImpl.hpp b/src/server/GraphObjectImpl.hpp index b2fa864e..5df7b565 100644 --- a/src/server/GraphObjectImpl.hpp +++ b/src/server/GraphObjectImpl.hpp @@ -17,15 +17,16 @@ #ifndef INGEN_ENGINE_GRAPHOBJECTIMPL_HPP #define INGEN_ENGINE_GRAPHOBJECTIMPL_HPP -#include <string> -#include <map> -#include <cstddef> #include <cassert> +#include <cstddef> +#include <map> +#include <string> + +#include "ingen/GraphObject.hpp" +#include "ingen/Resource.hpp" #include "raul/Deletable.hpp" #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "ingen/GraphObject.hpp" -#include "ingen/shared/ResourceImpl.hpp" namespace Raul { class Maid; } @@ -48,8 +49,7 @@ class BufferFactory; * * \ingroup engine */ -class GraphObjectImpl : virtual public GraphObject - , public Ingen::Shared::ResourceImpl +class GraphObjectImpl : public GraphObject { public: virtual ~GraphObjectImpl() {} |