diff options
author | David Robillard <d@drobilla.net> | 2008-08-18 19:02:13 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-08-18 19:02:13 +0000 |
commit | f31f6e53c139e194d0d0b4f24b7988c5c3652727 (patch) | |
tree | a0f2dbf18bc727a050149548ff24af29d5f7c132 /src/libs/shared/ClashAvoider.hpp | |
parent | 76466bde179e9b0d58b1586fb3f4ed40dedbdc13 (diff) | |
download | ingen-f31f6e53c139e194d0d0b4f24b7988c5c3652727.tar.gz ingen-f31f6e53c139e194d0d0b4f24b7988c5c3652727.tar.bz2 ingen-f31f6e53c139e194d0d0b4f24b7988c5c3652727.zip |
Fix copy/paste between different patches.
Barf less serialisation stuff to the console.
git-svn-id: http://svn.drobilla.net/lad/ingen@1431 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/shared/ClashAvoider.hpp')
-rw-r--r-- | src/libs/shared/ClashAvoider.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libs/shared/ClashAvoider.hpp b/src/libs/shared/ClashAvoider.hpp index 3c8a1c9f..9f205ff5 100644 --- a/src/libs/shared/ClashAvoider.hpp +++ b/src/libs/shared/ClashAvoider.hpp @@ -37,8 +37,9 @@ class Store; class ClashAvoider : public CommonInterface { public: - ClashAvoider(Store& store, const Raul::Path& prefix, CommonInterface& target) - : _prefix(prefix), _store(store), _target(target) {} + ClashAvoider(Store& store, const Raul::Path& prefix, CommonInterface& target, + Store* also_avoid=NULL) + : _prefix(prefix), _store(store), _target(target), _also_avoid(also_avoid) {} void set_target(CommonInterface& target) { _target = target; } @@ -87,7 +88,10 @@ private: Store& _store; CommonInterface& _target; - typedef std::map<Raul::Symbol, unsigned> Offsets; + Store* _also_avoid; + bool exists(const Raul::Path& path) const; + + typedef std::map<Raul::Path, unsigned> Offsets; Offsets _offsets; typedef std::map<Raul::Path, Raul::Path> SymbolMap; |