summaryrefslogtreecommitdiffstats
path: root/raul/TableImpl.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-05-01 21:16:31 +0000
committerDavid Robillard <d@drobilla.net>2008-05-01 21:16:31 +0000
commit9c0d6de6406bee77c907d7e131b3bf5bcfbd0057 (patch)
tree6e2d9955c8d1e4d20036c631df38fcf9d9ef5d95 /raul/TableImpl.hpp
parent0655c632293211d6e0a23b13e277604600c4b683 (diff)
downloadraul-9c0d6de6406bee77c907d7e131b3bf5bcfbd0057.tar.gz
raul-9c0d6de6406bee77c907d7e131b3bf5bcfbd0057.tar.bz2
raul-9c0d6de6406bee77c907d7e131b3bf5bcfbd0057.zip
GCC 4.3 fixes.
git-svn-id: http://svn.drobilla.net/lad/raul@1191 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'raul/TableImpl.hpp')
-rw-r--r--raul/TableImpl.hpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/raul/TableImpl.hpp b/raul/TableImpl.hpp
index 4f1f6aa..e8053c5 100644
--- a/raul/TableImpl.hpp
+++ b/raul/TableImpl.hpp
@@ -150,11 +150,12 @@ Table<K,T>::find_range_end(iterator start, bool (*comp)(const K&,const K&))
size_t lower = start._index;
size_t upper = size() - 1;
- if (lower == upper)
+ if (lower == upper) {
if (comp(key, _entries[lower].first))
return iterator(*this, lower+1);
else
return this->end();
+ }
size_t i;
@@ -162,11 +163,12 @@ Table<K,T>::find_range_end(iterator start, bool (*comp)(const K&,const K&))
i = lower + ((upper - lower) / 2);
- if (upper - lower == 1)
+ if (upper - lower == 1) {
if (comp(key, _entries[upper].first) && upper < size())
return iterator(*this, upper+1);
else if (lower < size())
return iterator(*this, lower+1);
+ }
const Entry& elem = _entries[i];
@@ -268,7 +270,7 @@ Table<K,T>::insert(const std::pair<K, T>& entry)
const K& key = entry.first;
const T& value = entry.second;
- if (size() == 0 || size() == 1 && key > _entries[0].first) {
+ if (size() == 0 || (size() == 1 && key > _entries[0].first)) {
_entries.push_back(entry);
return std::make_pair(iterator(*this, size()-1), true);
} else if (size() == 1) {