From 49fb28e5829595e9f3210d213041f04462f5a1f5 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 18 Oct 2011 16:20:14 +0000
Subject: Clang warning fixes.

git-svn-id: http://svn.drobilla.net/lad/trunk/raul@3546 a436a847-0d15-0410-975c-d299462d15a1
---
 raul/PathTable.hpp | 6 ++++--
 raul/Table.hpp     | 2 +-
 raul/TableImpl.hpp | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'raul')

diff --git a/raul/PathTable.hpp b/raul/PathTable.hpp
index 90441ac..b842239 100644
--- a/raul/PathTable.hpp
+++ b/raul/PathTable.hpp
@@ -37,13 +37,15 @@ public:
 	typename Table<Path, T>::iterator find_descendants_end(
 			typename Table<Path, T>::iterator parent)
 	{
-		return find_range_end(parent, &Path::descendant_comparator);
+		return Table<Path, T>::find_range_end(parent,
+		                                      &Path::descendant_comparator);
 	}
 
 	typename Table<Path, T>::const_iterator find_descendants_end(
 			typename Table<Path, T>::const_iterator parent) const
 	{
-		return find_range_end(parent, &Path::descendant_comparator);
+		return Table<Path, T>::find_range_end(parent,
+		                                      &Path::descendant_comparator);
 	}
 };
 
diff --git a/raul/Table.hpp b/raul/Table.hpp
index dd5c1d7..8c4f015 100644
--- a/raul/Table.hpp
+++ b/raul/Table.hpp
@@ -111,7 +111,7 @@ private:
 	bool is_sorted() const;
 #endif
 
-	friend class iterator;
+	friend struct iterator;
 
 	typedef std::pair<K, T> Entry;
 
diff --git a/raul/TableImpl.hpp b/raul/TableImpl.hpp
index e1ba32d..3f91f10 100644
--- a/raul/TableImpl.hpp
+++ b/raul/TableImpl.hpp
@@ -241,7 +241,7 @@ Table<K, T>::cram(const Table<K,T>& range)
 	assert(is_sorted());
 #endif
 
-	return make_pair(iterator(*this, insert_index), true);
+	return std::make_pair(iterator(*this, insert_index), true);
 }
 
 /** Add an item to the table, using \a entry.first as the search key.
@@ -329,7 +329,7 @@ Table<K, T>::operator[](const K& key)
 	if (i != end()) {
 		return i->second;
 	} else {
-		std::pair<iterator,bool> ret = insert(make_pair(key, T()));
+		std::pair<iterator,bool> ret = insert(std::make_pair(key, T()));
 		return ret.first->second;
 	}
 }
-- 
cgit v1.2.1