From a7d83f19b08eb4c6f79a82fe60c2b86db13f4420 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 24 Nov 2018 13:44:03 +0100
Subject: Squashed 'waflib/' changes from 6e726eb1..5ea8f99f

5ea8f99f Improve test output spacing
0e23b29f Raise exception when test suite fails to ensure non-zero exit status
d6de073b Show run time of unit tests
5b655541 Add short configure option for ultra-strict flags
4687ba6d Use gtest-like test output
258903d9 Fix failure count in test group summaries
da07e738 Fix verbose tests with Python 3

git-subtree-dir: waflib
git-subtree-split: 5ea8f99f6e1246079c1fe6bb590c38a53aadd40d
---
 ingen/ClashAvoider.hpp | 55 --------------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 ingen/ClashAvoider.hpp

(limited to 'ingen/ClashAvoider.hpp')

diff --git a/ingen/ClashAvoider.hpp b/ingen/ClashAvoider.hpp
deleted file mode 100644
index 069c8fef..00000000
--- a/ingen/ClashAvoider.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  This file is part of Ingen.
-  Copyright 2007-2015 David Robillard <http://drobilla.net/>
-
-  Ingen is free software: you can redistribute it and/or modify it under the
-  terms of the GNU Affero General Public License as published by the Free
-  Software Foundation, either version 3 of the License, or any later version.
-
-  Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU Affero General Public License for details.
-
-  You should have received a copy of the GNU Affero General Public License
-  along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef INGEN_CLASHAVOIDER_HPP
-#define INGEN_CLASHAVOIDER_HPP
-
-#include <map>
-
-#include "ingen/ingen.h"
-#include "raul/Path.hpp"
-
-namespace Ingen {
-
-class Store;
-class URI;
-
-/** Maps paths so they do not clash with an existing object in a store.
- *
- * @ingroup ingen
- */
-class INGEN_API ClashAvoider
-{
-public:
-	explicit ClashAvoider(const Store& store);
-
-	const URI        map_uri(const URI& in);
-	const Raul::Path map_path(const Raul::Path& in);
-
-	bool exists(const Raul::Path& path) const;
-
-private:
-	typedef std::map<Raul::Path, unsigned>   Offsets;
-	typedef std::map<Raul::Path, Raul::Path> SymbolMap;
-
-	const Store& _store;
-	Offsets      _offsets;
-	SymbolMap    _symbol_map;
-};
-
-} // namespace Ingen
-
-#endif // INGEN_CLASHAVOIDER_HPP
-- 
cgit v1.2.1