X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=genome.cpp;h=f50dd9285065da96bd346aa727e43f1cd3901a81;hb=d6e40359c3e9ec0dce7d46a9462ff76fb122b4bd;hp=9924018052c845a7bac3e6d7f06bc4fe36fe07da;hpb=d18c96d7bab891f10e30e82d1656ccef1d162924;p=genome.git

diff --git a/genome.cpp b/genome.cpp
index 9924018..f50dd92 100644
--- a/genome.cpp
+++ b/genome.cpp
@@ -77,7 +77,7 @@ static int BUFFER=1500;
 static int INCREMENT=1000;
 
 #define BLOCKSIZE   128
-#define SWAP(tmp,a,b)  tmp=a; a=b; b=tmp;
+#define SWAP(x,y) do {typeof(x) temp##x##y = x; x = y; y = temp##x##y; } while (0)
 
 static vector< vector< vector<bool> > > chromosome;
 static int * fragmentLength;
@@ -174,18 +174,15 @@ void FreeIntPtrMatrix(int *** & matrix, int rows){
    
 void NewGeneration(){
 	
-   int *** ptrmatrix, * vector;
-   bool * boolvector;
-   
 //    for(int i=0;i<maxN;i++){
 // 	if(parent_flags[i])printf("numBlock=%d parent=%d first=%d last=%d\n",numBLOCKs,i,parent_First[i],parent_Last[i]);   
 //    }
    
-   SWAP(ptrmatrix, children, parents);
-   SWAP(vector, child_First, parent_First);
-   SWAP(vector, child_Last, parent_Last);
-   SWAP(boolvector, child_flags, parent_flags);
-   SWAP(vector, cblocks, pblocks);
+   SWAP(children, parents);
+   SWAP(child_First, parent_First);
+   SWAP(child_Last, parent_Last);
+   SWAP(child_flags, parent_flags);
+   SWAP(cblocks, pblocks);
    
    if(!noChange){
 	   currentProfile++;