| 1 |
commit: 4e029fcdc6e0621a3908482f1ed65c61022e5ad6 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 5 17:39:51 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 6 11:59:47 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e029fcd |
| 7 |
|
| 8 |
app-text/sword: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/6457 |
| 11 |
|
| 12 |
app-text/sword/files/sword-1.6.2-gcc47.patch | 35 ---------------------------- |
| 13 |
1 file changed, 35 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-text/sword/files/sword-1.6.2-gcc47.patch b/app-text/sword/files/sword-1.6.2-gcc47.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 7b55de75b64..00000000000 |
| 18 |
--- a/app-text/sword/files/sword-1.6.2-gcc47.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,35 +0,0 @@ |
| 21 |
-https://bugs.gentoo.org/419505 |
| 22 |
- |
| 23 |
- |
| 24 |
---- a/include/multimapwdef.h |
| 25 |
-+++ b/include/multimapwdef.h |
| 26 |
-@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> { |
| 27 |
- public: |
| 28 |
- typedef std::pair<const Key, T> value_type; |
| 29 |
- T& getWithDefault(const Key& k, const T& defaultValue) { |
| 30 |
-- if (find(k) == this->end()) { |
| 31 |
-- insert(value_type(k, defaultValue)); |
| 32 |
-+ if (this->find(k) == this->end()) { |
| 33 |
-+ this->insert(value_type(k, defaultValue)); |
| 34 |
- } |
| 35 |
-- return (*(find(k))).second; |
| 36 |
-+ return (*(this->find(k))).second; |
| 37 |
- } |
| 38 |
- |
| 39 |
- T& operator[](const Key& k) { |
| 40 |
-- if (find(k) == this->end()) { |
| 41 |
-- insert(value_type(k, T())); |
| 42 |
-+ if (this->find(k) == this->end()) { |
| 43 |
-+ this->insert(value_type(k, T())); |
| 44 |
- } |
| 45 |
-- return (*(find(k))).second; |
| 46 |
-+ return (*(this->find(k))).second; |
| 47 |
- } |
| 48 |
- bool has(const Key& k, const T &val) const { |
| 49 |
-- typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); |
| 50 |
-- typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); |
| 51 |
-+ typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k); |
| 52 |
-+ typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k); |
| 53 |
- for (; start!=end; start++) { |
| 54 |
- if (start->second == val) |
| 55 |
- return true; |
Archives