From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 9 Aug 2000 23:10:55 +0000 (+0000)
Subject: r179: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~838
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=b9a7ca1861da4fe6d5891920ba3b38de1ae11594

r179: *** empty log message ***
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index f724e53..a79c7e2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -50,10 +50,10 @@ CC_LAM = $(lamdir)/bin/balky
 LAM_EXTRA_SRC = mpiworld.cpp
 
 pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-	$(CC_LAM) @DEF@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+	$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-	$(CC_LAM) @DEF@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+	$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 	$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
diff --git a/tools/pjrec.cpp b/tools/pjrec.cpp
index bab43e7..bee3d47 100644
--- a/tools/pjrec.cpp
+++ b/tools/pjrec.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: pjrec.cpp,v 1.10 2000/08/03 09:57:29 kevin Exp $
+**  $Id: pjrec.cpp,v 1.11 2000/08/09 23:10:55 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -49,7 +49,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: pjrec.cpp,v 1.10 2000/08/03 09:57:29 kevin Exp $";
+static const char* g_szIdStr = "$Id: pjrec.cpp,v 1.11 2000/08/09 23:10:55 kevin Exp $";
 
 void 
 pjrec_usage (const char *program)
@@ -390,7 +390,7 @@ ReduceImageMPI (MPIWorld& mpiWorld, ImageFile* imLocal, ImageFile* imGlobal)
 {
   ImageFileArray vLocal = imLocal->getArray();
 
-  for (int ix = 0; ix < imLocal->nx(); ix++) {
+  for (unsigned int ix = 0; ix < imLocal->nx(); ix++) {
     void *recvbuf = NULL;
     if (mpiWorld.getRank() == 0) {
       ImageFileArray vGlobal = imGlobal->getArray();