diff options
author | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
---|---|---|
committer | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
commit | 2735c9d273c54b555681f30f5c685998fed7b484 (patch) | |
tree | f8172dbea44d1c4751a99a62fb236a14c9d2dc20 /pcr/sword/multimap.patch | |
parent | d78a32a6ccb8663a62a093b54e947e2efc840fe0 (diff) | |
parent | 97f65e06566f3bb15bc7395624017b8e6ca0d043 (diff) | |
download | abslibre-2735c9d273c54b555681f30f5c685998fed7b484.tar.gz abslibre-2735c9d273c54b555681f30f5c685998fed7b484.tar.bz2 abslibre-2735c9d273c54b555681f30f5c685998fed7b484.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'pcr/sword/multimap.patch')
-rw-r--r-- | pcr/sword/multimap.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch new file mode 100644 index 000000000..7957ab2d8 --- /dev/null +++ b/pcr/sword/multimap.patch @@ -0,0 +1,39 @@ +--- sword-1.6.2/include/multimapwdef.h 2004-05-04 23:01:39.000000000 +0200 ++++ /usr/include/sword/multimapwdef.h 2012-06-02 13:37:47.816457345 +0200 +@@ -7,26 +7,26 @@ + + // multmap that still lets you use [] to reference FIRST + // entry of a key if multiples exist +-template <class Key, class T, class Compare> +-class multimapwithdefault : public std::multimap<Key, T, Compare> { ++template < class Key, class T, class Compare > ++class multimapwithdefault : public std::multimap< Key, T, Compare > { + public: +- typedef std::pair<const Key, T> value_type; ++ 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; + } + + 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; |