[irstlm] 61/78: fixed a couple of minor type inconsistencies

[Giulio Paci]

This is an automated email from the git hooks/post-receive script.

giuliopaci-guest pushed a commit to tag adaptiveLM.v0.10
in repository irstlm.

commit 914f322b2138a21cc2fe6b43c4d8d373dca85309
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Wed Dec 2 16:39:17 2015 +0100

    fixed a couple of minor type inconsistencies
---
 src/lmInterpolation.cpp | 4 ++--
 src/lmtable.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lmInterpolation.cpp b/src/lmInterpolation.cpp
index 53c019b..6bdbafa 100644
--- a/src/lmInterpolation.cpp
+++ b/src/lmInterpolation.cpp
@@ -202,7 +202,7 @@ namespace irstlm {
 		double _logpr;
 		
 		char* _maxsuffptr=NULL,*actualmaxsuffptr=NULL;
-		ngram_state_t _maxsuffidx=NULL,actualmaxsuffidx=NULL;
+		ngram_state_t _maxsuffidx=0,actualmaxsuffidx=0;
 		unsigned int _statesize=0,actualstatesize=0;
 		int _bol=0,actualbol=MAX_NGRAM;
 		double _bow=0.0,actualbow=0.0; 
@@ -287,7 +287,7 @@ namespace irstlm {
 		double _logpr;
 		
 		char* _maxsuffptr=NULL,*actualmaxsuffptr=NULL;
-		ngram_state_t _maxsuffidx=NULL,actualmaxsuffidx=NULL;
+		ngram_state_t _maxsuffidx=0,actualmaxsuffidx=0;
 		unsigned int _statesize=0,actualstatesize=0;
 		int _bol=0,actualbol=MAX_NGRAM;
 		double _bow=0.0,actualbow=0.0; 
diff --git a/src/lmtable.cpp b/src/lmtable.cpp
index e5a7cc8..b2d45c8 100644
--- a/src/lmtable.cpp
+++ b/src/lmtable.cpp
@@ -2580,7 +2580,7 @@ namespace irstlm {
 		if (ong.size==0) {
 			if (statesize!=NULL) *statesize=0;
 			if (state!=NULL) *state=NULL;
-			if (ngramstate!=NULL) *ngramstate=NULL;
+			if (ngramstate!=NULL) *ngramstate=0;
 			if (extendible!=NULL) *extendible=false;
 			if (lastbow!=NULL) *lastbow=false;
 			return 0.0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/irstlm.git