getting rid of warnings

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@854 1f5c12ca-751b-0410-a591-d2e778427230

7 files changed, 13 insertions, 11 deletions

diff --git a/moses/.cdtbuild b/moses/.cdtbuild
index 35d79b359..f947fd9c3 100755
--- a/moses/.cdtbuild
+++ b/moses/.cdtbuild
@@ -48,7 +48,8 @@
 <listOptionValue builtIn="false" value="_LARGE_FILES"/>
 </option>
 <option id="gnu.cpp.compiler.option.debugging.gprof.1449614968" superClass="gnu.cpp.compiler.option.debugging.gprof" value="false" valueType="boolean"/>
-<option id="gnu.cpp.compiler.option.warnings.allwarn.1037990342" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="false" valueType="boolean"/>
+<option id="gnu.cpp.compiler.option.warnings.allwarn.1037990342" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="true" valueType="boolean"/>
+<option id="gnu.cpp.compiler.option.warnings.pedantic.280967211" superClass="gnu.cpp.compiler.option.warnings.pedantic" value="false" valueType="boolean"/>
 </tool>
 <tool id="cdt.managedbuild.tool.gnu.archiver.lib.release.1731276863" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.lib.release"/>
 <tool id="cdt.managedbuild.tool.gnu.assembler.lib.release.693340097" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.lib.release"/>
diff --git a/moses/src/PDTAimp.h b/moses/src/PDTAimp.h
index 03bc2cafd..2e0d9af0d 100644
--- a/moses/src/PDTAimp.h
+++ b/moses/src/PDTAimp.h
@@ -343,8 +343,8 @@ public:
 
 		std::map<Range,E2Costs> cov2cand;
 		std::vector<State> stack;
-		for(size_t i=0;i<srcSize;++i) 
-			stack.push_back(State(i,i,m_dict->GetRoot()));
+		for(Position i=0 ; i < srcSize ; ++i) 
+			stack.push_back(State(i, i, m_dict->GetRoot()));
 
 		while(!stack.empty()) 
 			{
@@ -404,15 +404,15 @@ public:
 												std::transform(tcands[i].second.begin(),tcands[i].second.end(),nscores.begin(),TransformScore);
 												switch(m_numInputScores)
 													{
-													case 2: nscores[nscores.size()-1-m_numInputScores+2]=-1.0*newRealWords; // do not use -newRealWords ! -- RZ
-													case 1: nscores[nscores.size()-1-m_numInputScores+1]=newScore;
+													case 2: nscores[nscores.size()-1-m_numInputScores+2]= -1.0f * newRealWords; // do not use -newRealWords ! -- RZ
+													case 1: nscores[nscores.size()-1-m_numInputScores+1]= newScore;
 													case 0: break;
 													default:
 														std::cerr<<"ERROR: too many model scaling factors for input weights 'weight-i' : "<<m_numInputScores<<"\n";
 														abort();
 													}
 												assert(nscores.size()==m_weights.size());
-												float score=std::inner_product(nscores.begin(),nscores.end(),m_weights.begin(),0.0);
+												float score=std::inner_product(nscores.begin(), nscores.end(), m_weights.begin(), 0.0f);
 
 												score-=tcands[i].first.size() * m_weightWP;
 												std::pair<E2Costs::iterator,bool> p=e2costs.insert(std::make_pair(tcands[i].first,TScores()));
diff --git a/moses/src/StaticData.cpp b/moses/src/StaticData.cpp
index 3b70e7fa4..083e6edf4 100755
--- a/moses/src/StaticData.cpp
+++ b/moses/src/StaticData.cpp
@@ -446,7 +446,7 @@ bool StaticData::LoadParameters(int argc, char* argv[])
 		Scan<int>(m_parameter.GetParam("distortion-limit")[0])
 		: -1;
 	m_useDistortionFutureCosts = (m_parameter.GetParam("use-distortion-future-costs").size() > 0) 
-		? Scan<int>(m_parameter.GetParam("use-distortion-future-costs")[0]) : 0;
+		? Scan<bool>(m_parameter.GetParam("use-distortion-future-costs")[0]) : false;
 	//TRACE_ERR("using distortion future costs? "<<UseDistortionFutureCosts()<<"\n");
 	
 	m_beamThreshold = (m_parameter.GetParam("beam-threshold").size() > 0) ?
diff --git a/moses/src/StaticData.h b/moses/src/StaticData.h
index d06f9cf5e..451da018a 100755
--- a/moses/src/StaticData.h
+++ b/moses/src/StaticData.h
@@ -90,7 +90,7 @@ protected:
 	bool m_sourceStartPosMattersForRecombination;
 
 	int m_inputType;
-	unsigned m_numInputScores;
+	size_t m_numInputScores;
 
 	size_t m_verboseLevel;
 	DistortionScoreProducer *m_distortionScoreProducer;
diff --git a/moses/src/TargetPhrase.cpp b/moses/src/TargetPhrase.cpp
index ff1e2604d..412b5888c 100644
--- a/moses/src/TargetPhrase.cpp
+++ b/moses/src/TargetPhrase.cpp
@@ -48,7 +48,7 @@ void TargetPhrase::SetScore(const ScoreProducer* translationScoreProducer,
 	assert(weightT.size() == scoreVector.size());
 	// calc average score if non-best
 
-	m_transScore = std::inner_product(scoreVector.begin(),scoreVector.end(),weightT.begin(),0.0);
+	m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightT.begin(), 0.0f);
 	m_scoreBreakdown.PlusEquals(translationScoreProducer, scoreVector);
 
   // Replicated from TranslationOptions.cpp
diff --git a/moses/src/UserMessage.cpp b/moses/src/UserMessage.cpp
index 6b1444e95..024f15ddb 100644
--- a/moses/src/UserMessage.cpp
+++ b/moses/src/UserMessage.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 using namespace std;
 
-const int MAX_MSG_QUEUE = 5;
+const size_t MAX_MSG_QUEUE = 5;
 
 bool UserMessage::m_toStderr	= true;
 bool UserMessage::m_toQueue		= false;
diff --git a/moses/src/WordsBitmap.cpp b/moses/src/WordsBitmap.cpp
index 9d0e3b09b..801194320 100755
--- a/moses/src/WordsBitmap.cpp
+++ b/moses/src/WordsBitmap.cpp
@@ -45,7 +45,8 @@ int WordsBitmap::GetFutureCosts(int lastPos) const
 			//      sum+=getJumpCosts(lastPos,i,maxJumpWidth);
 		}
 		//    if(sum>1e5) return sum;
-		if(i>0 && ai==0 && (i+1==m_size||aip1) ) lastPos=i+1;
+		if(i>0 && ai==0 && (i+1==m_size||aip1) ) 
+			lastPos = (int) (i+1);
 	}
 
 	//  sum+=getJumpCosts(lastPos,as,maxJumpWidth);