From 82cec16e7f944b7f2b0c8fe202aca79c81e55646 Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Fri, 17 Sep 2010 09:11:11 +0000
Subject: [PATCH] Bug: type wrong for bpm, corrector counting functions
---
tracy/tracy/src/soleilcommon.cc | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tracy/tracy/src/soleilcommon.cc b/tracy/tracy/src/soleilcommon.cc
index 311027a..2faca81 100644
--- a/tracy/tracy/src/soleilcommon.cc
+++ b/tracy/tracy/src/soleilcommon.cc
@@ -539,19 +539,19 @@ void Read_Lattice(char *fic)
long get_bpm_number(void)
{
int i;
- long nbpm = 0L;
+ int nbpm = 0;
CellType Cell;
- for (i = 0; i <= globval.Cell_nLoc; i++)
+ for (i = 0; i < globval.Cell_nLoc; i++)
{
getelem(i, &Cell); /* get element */
if (strncmp(Cell.Elem.PName, "bpm", 3) == 0)
{
- globval.bpm_list[nbpm] = i;
+ globval.bpm_list[nbpm] = (long) i;
nbpm++;
}
}
- return nbpm;
+ return (long) nbpm;
}
/****************************************************************************/
@@ -583,19 +583,19 @@ long get_bpm_number(void)
long get_hcorr_number(void)
{
int i;
- long nb = 0L;
+ int nb = 0;
CellType Cell;
- for (i = 0; i <= globval.Cell_nLoc; i++)
+ for (i = 0; i < globval.Cell_nLoc; i++)
{
getelem(i, &Cell); /* get element */
if (strncmp(Cell.Elem.PName, "ch", 2) == 0)
{
- globval.hcorr_list[nb] = i;
+ globval.hcorr_list[nb] = (long)i;
nb++;
}
}
- return nb;
+ return (long) nb;
}
/****************************************************************************/
@@ -627,7 +627,7 @@ long get_hcorr_number(void)
long get_vcorr_number(void)
{
int i;
- long nb = 0L;
+ int nb = 0;
CellType Cell;
for (i = 0; i <= globval.Cell_nLoc; i++)
@@ -635,11 +635,11 @@ long get_vcorr_number(void)
getelem(i, &Cell); /* get element */
if (strncmp(Cell.Elem.PName, "cv", 2) == 0)
{
- globval.vcorr_list[nb] = i;
+ globval.vcorr_list[nb] = (long) i;
nb++;
}
}
- return nb;
+ return (long) nb;
}
/****************************************************************************/
--
GitLab