Changeset 190

Timestamp:

09/30/06 13:52:21 (2 years ago)

Author:

ug

Message:

Fixed compiler warnings.

Files:

• 06/libkombilo/search.cc (modified) (19 diffs)
• 06/libkombilo/sgfparser.cc (modified) (6 diffs)

06/libkombilo/search.cc

@@ -477 +477 @@
-
-    vector<MoveNC> newContList;
-
+unsigned 
-      newContList.push_back(MoveNC(Pattern::flipsX(f, pattern.contList[i].x, pattern.contList[i].y, 
-                                                      pattern.sizeX-1,pattern.sizeY-1),
@@ -514 +514 @@
-      }
-      vector<MoveNC> newContList;
-
+unsigned 
-        newContList.push_back(MoveNC(Pattern::flipsX(f, pattern.contList[i].x, pattern.contList[i].y, 
-                                                        pattern.sizeX-1,pattern.sizeY-1),
@@ -689 +689 @@
-  }
-  string labelList = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
+unsigned 
-
-  // FIXME assign labels which are already in the SGF file
@@ -697 +697 @@
-  
-  int max_hits = 0;
-
+ = 0
-  while (max_hits != -1 && labelIndex < labelList.size()) {
-    for(int i=0; i<pattern.sizeX*pattern.sizeY; i++) {
@@ -1039 +1039 @@
-
-  int index = gl.start();
-
+// 
-  // printf("%d patterns\n", plS);
-  char start;
@@ -1389 +1389 @@
-    cands->reserve(currentMatchList->size());
-
-
+(int)
-      Candidate* m = (*currentMatchList)[mCounter];
-      int dNO = 0;
@@ -1463 +1463 @@
-      char y = movel[movelistIndex+1] & 31;
-
-
-
-
+ = 'O'
+ = 'X'
+ = 'x'
-
-      if (!(movel[movelistIndex+1] & REMOVE) && (movel[movelistIndex+1] & (BLACK | WHITE))) {
@@ -1473 +1473 @@
-          invco = 'O';
-          lower_invco = 'o';
-        } else {
-          co = 'O';
-          invco = 'X';
-          lower_invco = 'x';
-        }
-
@@ -1503 +1499 @@
-              if (MoveNC(x, y, co) == ((*it)->contList)[(*it)->contListIndex]) {
-                (*it)->contListIndex++;
-
+int)(
-                  (*it)->dictsF = counter;
-                  (*it)->dictsFound = true;
@@ -1565 +1561 @@
-              if ((*it)->dictsFoundInitial) { // foundInitial
-                int ii = (*it)->contListIndex;
-
+int)(
-                    (x != (*it)->contList[ii].x || y != (*it)->contList[ii].y))
-                  ii++;
-
+int)(
-                  MoveNC help = (*it)->contList[ii];
-                  (*it)->contList[ii] = (*it)->contList[(*it)->contListIndex];
@@ -2492 +2488 @@
-//    else raise Exception; // FIXME
-//                         
-\
+
-//      patternList.updateContinuations(m[0], x+a0, y+a1, co, Xint, Yint,
-//              currentUInterv.first(), counter-1,
@@ -2604 +2600 @@
-    char strpip1[20];
-    sprintf(strpip1, "[[%d[[F", i);
-
+unsigned 
-    if (p != string::npos) {
-      if (argv[i]) {
@@ -2622 +2618 @@
-    }
-  }
-
+unsigned 
-  if (p != string::npos) gameInfoStr.replace(p, 3, 1, winner);
-
@@ -2643 +2639 @@
-    format1 = "id,re";
-    format2 = FORMAT;
-
-
+unsigned 
+unsigned 
-    while (p != string::npos) {
-      p = format2.find("[[",p);
@@ -2760 +2756 @@
-int GameList::next() {
-  current++;
-
+(int)
-  else {
-    if (oldList) delete oldList;
@@ -2954 +2950 @@
-  if (end==0) end = currentList->size();
-  vector<string> result;
-
+(int)
-  for(int i=start; i<end; i++) {
-    result.push_back((*all)[(*currentList)[i].second]->gameInfoStr + ", " + resultsStr((*all)[(*currentList)[i].second]));
@@ -3094 +3090 @@
-    bool year_found = false;
-    int p = 0;
-
+(int)
-      p = dt.find_first_of("0123456789", p);
-string::npos || p+4 > 
+(int)string::npos || p+4 > (int)
-      else {
-        year_found = (('0' <= dt[p] && dt[p] <= '9') && ('0' <= dt[p+1] && dt[p+1] <= '9') && ('0' <= dt[p+2] && dt[p+2] <= '9') && ('0' <= dt[p+3] && dt[p+3] <= '9'));
-
+(int)
-          date += dt.substr(p,4);
-          date += '-';
@@ -3114 +3110 @@
-      bool month_found = false;
-      p = 0;
-
+(int)
-        p = dt.find_first_of("0123456789", p);
-string::npos || p+2 > 
+(int)string::npos || p+2 > (int)
-        else {
-          month_found = ('0' <= dt[p] && dt[p] <= '9' && '0' <= dt[p+1] && dt[p+1] <= '9');
-
+(int)
-            date += dt.substr(p,2);
-            date += '-';
@@ -3134 +3130 @@
-        bool day_found = false;
-        p = 0;
-
+(int)
-          p = dt.find_first_of("0123456789", p);
-string::npos || p+2 > 
+(int)string::npos || p+2 > (int)
-          else {
-            day_found = ('0' <= dt[p] && dt[p] <= '9' && '0' <= dt[p+1] && dt[p+1] <= '9');
-
+(int)
-              date += dt.substr(p,2);
-            } else {

06/libkombilo/sgfparser.cc

@@ -103 +103 @@
-  char* t = new char[2*strlen(s)+1];
-  int j = 0;
-
+unsigned 
-    if (s[i] == '\\' || s[i] == ']') t[j++]='\\';
-    t[j++] = s[i];
@@ -955 +955 @@
-  result[0] = 0;
-
-node->SGFstring.size() + strlen(result
+(int)(node->SGFstring.size() + strlen(result)
-    s += 1000 + node->SGFstring.size();
-    char* res = new char[s];
@@ -973 +973 @@
-      char* r = outputVar(node);
-
-strlen(r) + strlen(result
+(int)(strlen(r) + strlen(result)
-        s += 1000 + strlen(r);
-        char* res = new char[s];
@@ -990 +990 @@
-        char* r = outputVar(node);
-
-strlen(r) + strlen(result
+(int)(strlen(r) + strlen(result)
-          s += 1000 + strlen(r);
-          char* res = new char[s];
@@ -1005 +1005 @@
-    }
-    else {
-node->SGFstring.size() + strlen(result
+(int)(node->SGFstring.size() + strlen(result)
-        s += 1000 + node->SGFstring.size();
-        char* res = new char[s];
@@ -1038 +1038 @@
-    char* t = outputVar(n);
-
-strlen(t) + strlen(result
+(int)(strlen(t) + strlen(result)
-      s += 2000 + strlen(t);
-      char* res = new char[s];