[patch] bow-20020213-gcc4.diff

bow-20020213-gcc4.diff (text/plain), 2.44 KB, created by Marcelo Goes (RETIRED) on 2005-04-07 16:21:00 UTC

diff --exclude='*~' -Naur bow-20020213/bow/libbow.h bow-20020213.new/bow/libbow.h
--- bow-20020213/bow/libbow.h	2002-02-13 20:00:29.000000000 -0300
+++ bow-20020213.new/bow/libbow.h	2005-04-07 19:51:24.000000000 -0300
@@ -1343,7 +1343,7 @@
 #include <bow/kl.h>
 #include <bow/em.h>
 #include <bow/knn.h>
-struct argp_child;		/* forward declare this type */
+#include "argp.h"
 
 /* Associate method M with the string NAME, so the method structure
    can be retrieved later with BOW_METHOD_AT_NAME().  Set the group
diff --exclude='*~' -Naur bow-20020213/dv.c bow-20020213.new/dv.c
--- bow-20020213/dv.c	1999-03-17 18:08:53.000000000 -0300
+++ bow-20020213.new/dv.c	2005-04-07 19:54:06.000000000 -0300
@@ -52,7 +52,7 @@
 {
   int dv_index;			/* The "document vector" index at
 				   which we are looking for. */
-  static inline void grow_if_necessary ()
+  inline void grow_if_necessary ()
     {
       if (error_on_creation)
 	bow_error ("Shouldn't be creating new entry for a weight.");
@@ -67,7 +67,7 @@
 				       + sizeof (bow_de) * (*dv)->size));
 	}
     }
-  static inline void initialize_dv_index (int dvi)
+  inline void initialize_dv_index (int dvi)
     {
       (*dv)->entry[dvi].di = di;
       (*dv)->entry[dvi].count = 0;

diff --exclude='*~' -Naur bow-20020213/multiclass.c bow-20020213.new/multiclass.c
--- bow-20020213/multiclass.c	1999-10-15 17:17:42.000000000 -0300
+++ bow-20020213.new/multiclass.c	2005-04-07 19:57:33.000000000 -0300
@@ -1050,7 +1050,7 @@
 void
 bow_sort_scores (bow_score *scores, int count)
 {
-  static int score_compare (const void *x, const void *y)
+  int score_compare (const void *x, const void *y)
     {
       if (((bow_score *)x)->weight > ((bow_score *)y)->weight)
 	return -1;
@@ -1256,6 +1256,7 @@
 	}
       return si;
     next_si:
+      continue;
     }
   return -1;
 }
@@ -1340,6 +1341,7 @@
 	  max_ci = ci;
 	}
     next_class1:
+        continue;
     }
 
   if (local_exclude_cis_size + 1 < exclude_cis_capacity/2
@@ -1421,8 +1423,10 @@
 	      max_ci2 = ci2;
 	    }
 	next_class22:
+      	   continue;
 	}
     next_class2:
+      continue;
     }
   assert (max_si >= 0);
 
diff --exclude='*~' -Naur bow-20020213/svm_base.c bow-20020213.new/svm_base.c
--- bow-20020213/svm_base.c	2002-02-13 19:49:41.000000000 -0300
+++ bow-20020213.new/svm_base.c	2005-04-07 19:55:42.000000000 -0300
@@ -261,7 +261,6 @@
     case 4:
       kernel = svm_kernel_fisher;
       break;
-    default:
     }
     break;
   case AL_TEST_IN_TRAIN_ARG: