summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2010-04-16 10:53:08 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-04-21 11:31:30 (GMT)
commit073c33838510c76c9d7769eb6941e58f3aff724f (patch)
tree72a6c62f7734c5d781a56d30d8888b9a49869c62
parent54400a5c370a5dc84eec89ebab8e2a5be39402a3 (diff)
downloadQt-073c33838510c76c9d7769eb6941e58f3aff724f.zip
Qt-073c33838510c76c9d7769eb6941e58f3aff724f.tar.gz
Qt-073c33838510c76c9d7769eb6941e58f3aff724f.tar.bz2
WINSCW compile fix for HashMap
WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen (cherry picked from commit c16ca6d08d7e3e7a0972aa1975a72882559edb26)
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h b/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h
index 09094d1..4631055 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/HashMap.h
@@ -88,9 +88,9 @@ namespace WTF {
// must have the following function members:
// static unsigned hash(const T&);
// static bool equal(const ValueType&, const T&);
- template<typename T, typename HashTranslator> iterator find(const T&);
- template<typename T, typename HashTranslator> const_iterator find(const T&) const;
- template<typename T, typename HashTranslator> bool contains(const T&) const;
+ template<typename TYPE, typename HashTranslator> iterator find(const TYPE&);
+ template<typename TYPE, typename HashTranslator> const_iterator find(const TYPE&) const;
+ template<typename TYPE, typename HashTranslator> bool contains(const TYPE&) const;
// An alternate version of add() that finds the object by hashing and comparing
// with some other type, to avoid the cost of type conversion if the object is already
@@ -98,7 +98,7 @@ namespace WTF {
// static unsigned hash(const T&);
// static bool equal(const ValueType&, const T&);
// static translate(ValueType&, const T&, unsigned hashCode);
- template<typename T, typename HashTranslator> pair<iterator, bool> add(const T&, const MappedType&);
+ template<typename TYPE, typename HashTranslator> pair<iterator, bool> add(const TYPE&, const MappedType&);
void checkConsistency() const;