From 73d5890c5ad1848c70c094001d3941126ffda8ac Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Wed, 11 Jul 2007 14:19:33 +0000
Subject: [PATCH] changes to remove mosts compiler warnings
---
particle.h | 9 +++++++--
sausages.cc | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/particle.h b/particle.h
index 3fa782b..51294f3 100644
--- a/particle.h
+++ b/particle.h
@@ -57,8 +57,8 @@ namespace PARTICLE{
const float& zdimin,
const bool& hasjumpedin=false,
const bool& simdiffin=false) :
- m_x(xin), m_y(yin), m_z(zin), m_rx(rxin),
- m_ry(ryin),m_rz(rzin),m_steplength(steplengthin),
+ m_x(xin), m_y(yin), m_z(zin), m_rx(rxin),m_ry(ryin),m_rz(rzin),m_rx_init(rxin),
+ m_ry_init(ryin),m_rz_init(rzin),m_steplength(steplengthin),
m_xdim(xdimin),m_ydim(ydimin),m_zdim(zdimin),
m_has_jumped(hasjumpedin),m_simdiff(false){}
Particle(){}
@@ -74,18 +74,23 @@ namespace PARTICLE{
const float& zdimin=2,
const bool& hasjumpedin=false,
const bool& simdiffin=false){
+
m_x=xin;
m_y=yin;
m_z=zin;
m_rx=rxin;
m_ry=ryin;
m_rz=rzin;
+ m_rx_init=rxin;
+ m_ry_init=ryin;
+ m_rz_init=rzin;
m_steplength=steplengthin;
m_xdim=xdimin;
m_ydim=ydimin;
m_zdim=zdimin;
m_has_jumped=hasjumpedin;
m_simdiff=simdiffin;
+
}
diff --git a/sausages.cc b/sausages.cc
index 5745ffc..ac4a961 100644
--- a/sausages.cc
+++ b/sausages.cc
@@ -56,7 +56,7 @@ int main ( int argc, char **argv ){
chunks.push_back(tmppair);
}
- for(int chunkno=0;chunkno < chunks.size();chunkno++){
+ for(unsigned int chunkno=0;chunkno < chunks.size();chunkno++){
for(int i=chunks[chunkno].first;i<=chunks[chunkno].second;i++){
out(coord(i,0,0),coord(i,1,0),coord(i,2,0))=chunkno+1;
}
--
GitLab