patch proposal

sword-1.6.2-gcc47.patch (text/plain), 1.19 KB, created by Olivier Huber on 2012-06-03 17:52:09 UTC

--- include/multimapwdef.h.orig	2004-05-04 23:01:39.000000000 +0200
+++ include/multimapwdef.h	2012-06-03 19:25:13.826906743 +0200
@@ -12,21 +12,21 @@
 public:
 	typedef std::pair<const Key, T> value_type;
 	T& getWithDefault(const Key& k, const T& defaultValue) {
-		if (find(k) == this->end()) {
-			insert(value_type(k, defaultValue));
+		if (this->find(k) == this->end()) {
+			this->insert(value_type(k, defaultValue));
 		}
-		return (*(find(k))).second;
+		return (*(this->find(k))).second;
 	}
 
 	T& operator[](const Key& k) {
-		if (find(k) == this->end()) {
-			insert(value_type(k, T()));
+		if (this->find(k) == this->end()) {
+			this->insert(value_type(k, T()));
 		}
-		return (*(find(k))).second;
+		return (*(this->find(k))).second;
 	}
 	bool has(const Key& k, const T &val) const {
-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
+		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
+		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
 		for (; start!=end; start++) {
 			if (start->second == val)
 				return true;