| 1 |
jlec 12/07/01 14:12:34 |
| 2 |
|
| 3 |
Added: charm-6.2.0-gcc-4.7.patch |
| 4 |
Log: |
| 5 |
sys-cluster/charm: Build with gcc-4.7, #424379; repact LDFLAGS, #337558 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: charm-6.2.0-gcc-4.7.patch |
| 16 |
=================================================================== |
| 17 |
src/util/cklists.h | 10 +++++----- |
| 18 |
1 files changed, 5 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/src/util/cklists.h b/src/util/cklists.h |
| 21 |
index 2fc6938..df29138 100644 |
| 22 |
--- a/src/util/cklists.h |
| 23 |
+++ b/src/util/cklists.h |
| 24 |
@@ -47,8 +47,8 @@ class CkQ : private CkSTLHelper<T>, private CkNoncopyable { |
| 25 |
mask = 0x0f; |
| 26 |
} |
| 27 |
T *newblk = new T[newlen]; |
| 28 |
- elementCopy(newblk,block+first,blklen-first); |
| 29 |
- elementCopy(newblk+blklen-first,block,first); |
| 30 |
+ this->elementCopy(newblk,block+first,blklen-first); |
| 31 |
+ this->elementCopy(newblk+blklen-first,block,first); |
| 32 |
delete[] block; block = newblk; |
| 33 |
blklen = newlen; first = 0; |
| 34 |
} |
| 35 |
@@ -197,7 +197,7 @@ class CkVec : private CkSTLHelper<T> { |
| 36 |
} |
| 37 |
void copyFrom(const this_type &src) { |
| 38 |
makeBlock(src.blklen, src.len); |
| 39 |
- elementCopy(block,src.block,blklen); |
| 40 |
+ this->elementCopy(block,src.block,blklen); |
| 41 |
} |
| 42 |
public: |
| 43 |
CkVec(): block(NULL), blklen(0), len(0) {} |
| 44 |
@@ -233,7 +233,7 @@ class CkVec : private CkSTLHelper<T> { |
| 45 |
T *oldBlock=block; |
| 46 |
makeBlock(newcapacity,len); |
| 47 |
if (newcapacity != blklen) return 0; |
| 48 |
- elementCopy(block,oldBlock,len); |
| 49 |
+ this->elementCopy(block,oldBlock,len); |
| 50 |
delete[] oldBlock; //WARNING: leaks if element copy throws exception |
| 51 |
return 1; |
| 52 |
} |
| 53 |
@@ -504,7 +504,7 @@ class CkPupAblePtrVec : public CkVec< CkZeroPtr<T, CkPupAblePtr<T> > > { |
| 54 |
} |
| 55 |
void copy_from(const this_type &t) { |
| 56 |
for (size_t i=0;i<t.length();i++) |
| 57 |
- push_back((T *)t[i]->clone()); |
| 58 |
+ this->push_back((T *)t[i]->clone()); |
| 59 |
} |
| 60 |
void destroy(void) { |
| 61 |
for (size_t i=0;i<this->length();i++) |
Archives