gentoo-x86 commit in sys-cluster/charm/files: charm-6.2.0-gcc-4.7.patch

jlec        12/07/01 14:12:34

  Added:                charm-6.2.0-gcc-4.7.patch
  Log:
  sys-cluster/charm: Build with gcc-4.7, #424379; repact LDFLAGS, #337558

  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch

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
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

Index: charm-6.2.0-gcc-4.7.patch
===================================================================
 src/util/cklists.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/util/cklists.h b/src/util/cklists.h
index 2fc6938..df29138 100644
--- a/src/util/cklists.h
+++ b/src/util/cklists.h
 <at>  <at>  -47,8 +47,8  <at>  <at>  class CkQ : private CkSTLHelper<T>, private CkNoncopyable {
 	mask = 0x0f;
       }
       T *newblk = new T[newlen];
-      elementCopy(newblk,block+first,blklen-first);
-      elementCopy(newblk+blklen-first,block,first);
+      this->elementCopy(newblk,block+first,blklen-first);
+      this->elementCopy(newblk+blklen-first,block,first);
       delete[] block; block = newblk;
       blklen = newlen; first = 0;
     }
 <at>  <at>  -197,7 +197,7  <at>  <at>  class CkVec : private CkSTLHelper<T> {
     }
     void copyFrom(const this_type &src) {
        makeBlock(src.blklen, src.len);
-       elementCopy(block,src.block,blklen);
+       this->elementCopy(block,src.block,blklen);
     }
   public:
     CkVec(): block(NULL), blklen(0), len(0) {}
 <at>  <at>  -233,7 +233,7  <at>  <at>  class CkVec : private CkSTLHelper<T> {
       T *oldBlock=block; 
       makeBlock(newcapacity,len);
       if (newcapacity != blklen) return 0;
-      elementCopy(block,oldBlock,len);
+      this->elementCopy(block,oldBlock,len);
       delete[] oldBlock; //WARNING: leaks if element copy throws exception
       return 1;
     }
 <at>  <at>  -504,7 +504,7  <at>  <at>  class CkPupAblePtrVec : public CkVec< CkZeroPtr<T, CkPupAblePtr<T> > > {
 	}
 	void copy_from(const this_type &t) {
 		for (size_t i=0;i<t.length();i++)
-			push_back((T *)t[i]->clone());
+			this->push_back((T *)t[i]->clone());
 	}
 	void destroy(void) {
 		for (size_t i=0;i<this->length();i++)