Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-misc/krusader/files: krusader-2.4.0_beta1-gcc47.patch
Date: Wed, 02 May 2012 20:16:51
Message-Id: 20120502201636.E4D572004C@flycatcher.gentoo.org
1 johu 12/05/02 20:16:36
2
3 Added: krusader-2.4.0_beta1-gcc47.patch
4 Log:
5 Revision bump adds upstream patch to fix build with gcc47 spotted by Michael (kensington) <gentoo@×××××××××××××××.com> wrt bug #414135.
6
7 (Portage version: 2.2.0_alpha101/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/krusader/files/krusader-2.4.0_beta1-gcc47.patch?rev=1.1&content-type=text/plain
14
15 Index: krusader-2.4.0_beta1-gcc47.patch
16 ===================================================================
17 --- a/krusader/UserAction/tstring.h
18 +++ b/krusader/UserAction/tstring.h
19 @@ -125,7 +125,7 @@ TagString_t<T>& TagString_t<T>::operator
20 str += s.str;
21 const unsigned disp = length();
22 for (typename taglist::const_iterator it = s.tags.begin(), end = s.tags.end();it != end;++it) {
23 - tags.push_back(make_pair((*it).first + disp, (*it).second));
24 + tags.push_back(std::make_pair((*it).first + disp, (*it).second));
25 }
26 return *this;
27 }
28 @@ -134,7 +134,7 @@ template <class T>
29 void TagString_t<T>::insertTag(uint pos, const T& t)
30 {
31 assert(pos <= length());
32 - tags.push_back(make_pair(pos, t));
33 + tags.push_back(std::make_pair(pos, t));
34 }
35
36 #endif