Changeset 6794

Show
Ignore:
Timestamp:
07/09/10 14:32:07 (17 months ago)
Author:
westram
Message:
  • compile ISLAND_HOPPING as C++
Location:
branches/refactor/ISLAND_HOPPING
Files:
1 modified
5 moved

Legend:

Unmodified
Added
Removed

  • branches/refactor/ISLAND_HOPPING/Makefile

    r6792 r6794  
    11# INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben 
    2 .SUFFIXES: .o .c .cpp .depend 
     2.SUFFIXES: .o .c .cxx .depend 
    33 
    44CPP_OBJECTS = island_hopping.o i-hopper.o align.o mem.o trnsprob.o 
    … …  
    88.c.o: 
    99        $(ACC) $(cflags) -DARB -c $<  $(CPPINCLUDES) 
    10 .cpp.o: 
    11         $(CPP) $(cflags) -c $<  $(CPPINCLUDES) 
     10.cxx.o: 
     11        $(CPP) $(cflags) -DARB -c $<  $(CPPINCLUDES) 
    1212 
    1313clean: 
    … …  
    2323.c.depend: 
    2424        $(MAKEDEPEND) -f- $(MAKEDEPENDFLAGS) $< 2>/dev/null >$@ 
    25 .cpp.depend: 
     25.cxx.depend: 
    2626        $(MAKEDEPEND) -f- $(MAKEDEPENDFLAGS) $< 2>/dev/null >$@ 
    2727 

  • branches/refactor/ISLAND_HOPPING/align.cxx

    r6516 r6794  
    322322    Island *p; Fragment *f,**ff,*L; int k,ii,jj,iii,jjj,l; double s; 
    323323 
    324     p=newBlock(sizeof(Island)); 
     324    p=(Island*)newBlock(sizeof(Island)); 
    325325 
    326326    ii=i; jj=j; l=0; s=0.; 
    … …  
    333333            k=U[ii][jj].up; 
    334334            if(k) { 
    335                 f=newBlock(sizeof(Fragment)); 
     335                f=(Fragment*)newBlock(sizeof(Fragment)); 
    336336                f->beginX=iii; f->beginY=jjj; f->length=l; 
    337337                l=0; *ff=f; ff=&f->next; 
    … …  
    351351            k=U[ii][jj].down; 
    352352            if(k) { 
    353                 f=newBlock(sizeof(Fragment)); 
     353                f=(Fragment*)newBlock(sizeof(Fragment)); 
    354354                f->beginX=iii-l+1; f->beginY=jjj-l+1; f->length=l; 
    355355                l=0; f->next=L; L=f; 
    … …  
    805805    int i,j,maxlen; 
    806806 
    807     *XX = newBlock((nX+nY+1)*sizeof(char)); 
    808     *YY = newBlock((nX+nY+1)*sizeof(char)); 
     807    *XX = (char*)newBlock((nX+nY+1)*sizeof(char)); 
     808    *YY = (char*)newBlock((nX+nY+1)*sizeof(char)); 
    809809 
    810810    Supp=supp; 

  • branches/refactor/ISLAND_HOPPING/i-hopper.cxx

  • branches/refactor/ISLAND_HOPPING/island_hopping.cxx

    r6516 r6794  
    1212 
    1313#define EXTERN 
    14 extern "C" { 
    1514#include "i-hopper.h" 
    1615#include "mem.h" 
    17 } 
    1816 
    1917#ifndef ARB_ASSERT_H 

  • branches/refactor/ISLAND_HOPPING/trnsprob.cxx

    r6516 r6794  
    157157    double ***P; short j; 
    158158 
    159     P=newVector(128,sizeof(double **)); 
     159    P=(double***)newVector(128,sizeof(double **)); 
    160160    for(j=0;j<128;j++) P[j]=(double **)newMatrix(N,N,sizeof(double)); 
    161161