[irstlm] 79/146: Updated 1001_fix_compilation_warnings.patch.

[Giulio Paci]

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

giuliopaci-guest pushed a commit to branch master
in repository irstlm.

commit 73104753dc639aa82f624c562dce43dd905b2ebf
Author: Giulio Paci <giuliopaci at gmail.com>
Date:   Sat May 4 19:45:44 2013 +0200

    Updated 1001_fix_compilation_warnings.patch.
---
 debian/patches/1001_fix_compilation_warnings.patch | 41 ++++++++++------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/debian/patches/1001_fix_compilation_warnings.patch b/debian/patches/1001_fix_compilation_warnings.patch
index 0cf46ab..35fc2dc 100644
--- a/debian/patches/1001_fix_compilation_warnings.patch
+++ b/debian/patches/1001_fix_compilation_warnings.patch
@@ -3,27 +3,22 @@ Author: Giulio Paci <giuliopaci at gmail.com>
 Forwarded: yes
 --- a/src/compile-lm.cpp
 +++ b/src/compile-lm.cpp
-@@ -180,13 +180,13 @@
-   bool invert = (sinvert == "yes"? true : false);
+@@ -138,15 +138,6 @@
+     usage("Warning: Please specify a LM file to read from");
+   }
  
-   //Define output type of table
--  OUTFILE_TYPE outtype;
+-  //Define output type of table
+-	OUTFILE_TYPE outtype;
 -  if (textoutput)
 -    outtype=TEXT;
--  else if (seval != "" || sscore == "yes")
+-  else if (seval != NULL || sscore)
 -    outtype=NONE;
 -  else
 -    outtype=BINARY;
-+  //OUTFILE_TYPE outtype;
-+  //if (textoutput)
-+  //  outtype=TEXT;
-+  //else if (seval != "" || sscore == "yes")
-+  //  outtype=NONE;
-+  //else
-+  //  outtype=BINARY;
- 
+-
+   std::string infile = files[0];
+   std::string outfile = "";
  
-   int debug = atoi(sdebug.c_str());
 --- a/src/lmInterpolation.cpp
 +++ b/src/lmInterpolation.cpp
 @@ -91,10 +91,12 @@
@@ -41,7 +36,7 @@ Forwarded: yes
      m_weight[i] = (float) atof(words[0]);
 --- a/src/lmtable.cpp
 +++ b/src/lmtable.cpp
-@@ -723,7 +723,7 @@
+@@ -729,7 +729,7 @@
      if (parseline(inp,level,ng,prob,bow)) {
  
        // if table is inverted then revert n-gram
@@ -50,7 +45,7 @@ Forwarded: yes
          ing.invert(ng);
          ng=ing;
        }
-@@ -1611,7 +1611,9 @@
+@@ -1944,7 +1944,9 @@
    table_entry_pos_t offset=0,limit=cursize[1];
  
    //information of table entries
@@ -60,7 +55,7 @@ Forwarded: yes
    char* found;
    LMT_TYPE ndt;
    ng.link=NULL;
-@@ -1620,11 +1622,11 @@
+@@ -1953,11 +1955,11 @@
    for (int l=1; l<=lev; l++) {
  
      //initialize entry information
@@ -73,7 +68,7 @@ Forwarded: yes
      if (lmtcache[l] && lmtcache[l]->get(ng.wordp(n),found)) {
        hit=1;
      } else {
-@@ -1732,7 +1734,7 @@
+@@ -2068,7 +2070,7 @@
        out << ipr <<"\t";
  
        // if table is inverted then revert n-gram
@@ -82,7 +77,7 @@ Forwarded: yes
          ing.invert(ng);
          for (int k=ing.size; k>=1; k--) {
            if (k<ing.size) out << " ";
-@@ -2269,9 +2271,6 @@
+@@ -2609,9 +2611,6 @@
  
    ng.size=0;
  
@@ -94,7 +89,7 @@ Forwarded: yes
  }
 --- a/src/ngramtable.h
 +++ b/src/ngramtable.h
-@@ -664,11 +664,12 @@
+@@ -665,11 +665,12 @@
    }
  
    table mtable(node nd) {
@@ -111,7 +106,7 @@ Forwarded: yes
    table mtable(node nd,table value) {
 --- a/src/cplsa.cpp
 +++ b/src/cplsa.cpp
-@@ -282,7 +282,7 @@
+@@ -283,7 +283,7 @@
  
    //start of training
  
@@ -120,7 +115,7 @@ Forwarded: yes
    double LL=-1e+99;
  
    int iter=0;
-@@ -292,7 +292,7 @@
+@@ -293,7 +293,7 @@
    while (iter < maxiter)
      //while ( (iter < maxiter) && (((lastLL-LL)/lastLL)>0.00001))
    {
@@ -131,7 +126,7 @@ Forwarded: yes
      if (flagW)  //reset support arrays
 --- a/src/shiftlm.cpp
 +++ b/src/shiftlm.cpp
-@@ -533,12 +533,12 @@
+@@ -550,12 +550,12 @@
  
    assert(size<=2); // only works with bigrams //
  

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