Changeset 6794 for branches/refactor/ISLAND_HOPPING/align.cxx

Timestamp:

07/09/10 14:32:07 (21 months ago)

Author:

westram

Message:

• compile ISLAND_HOPPING as C++

Files:

• branches/refactor/ISLAND_HOPPING/align.cxx (moved) (moved from branches/refactor/ISLAND_HOPPING/align.c) (4 diffs, 1 prop)

branches/refactor/ISLAND_HOPPING/align.cxx

@@ -322 +322 @@
     Island *p; Fragment *f,**ff,*L; int k,ii,jj,iii,jjj,l; double s;
 
-    p=newBlock(sizeof(Island));
+    p=(Island*)newBlock(sizeof(Island));
 
     ii=i; jj=j; l=0; s=0.;
@@ -333 +333 @@
             k=U[ii][jj].up;
             if(k) {
-                f=newBlock(sizeof(Fragment));
+                f=(Fragment*)newBlock(sizeof(Fragment));
                 f->beginX=iii; f->beginY=jjj; f->length=l;
                 l=0; *ff=f; ff=&f->next;
@@ -351 +351 @@
             k=U[ii][jj].down;
             if(k) {
-                f=newBlock(sizeof(Fragment));
+                f=(Fragment*)newBlock(sizeof(Fragment));
                 f->beginX=iii-l+1; f->beginY=jjj-l+1; f->length=l;
                 l=0; f->next=L; L=f;
@@ -805 +805 @@
     int i,j,maxlen;
 
-    *XX = newBlock((nX+nY+1)*sizeof(char));
-    *YY = newBlock((nX+nY+1)*sizeof(char));
+    *XX = (char*)newBlock((nX+nY+1)*sizeof(char));
+    *YY = (char*)newBlock((nX+nY+1)*sizeof(char));
 
     Supp=supp;