merged changeset 591 (missing reading bug fix & GCC 4.4 compatibility…

…) from cm to main git-svn-id: https://pet.opendfki.de/repos/pet/main@593 4200e16c-5112-0410-ac55-d7fb557a720a
delph-in · Jul 15, 2009 · 4adc3f5 · 4adc3f5
1 parent 3dd8b8c
commit 4adc3f5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/cheap/item.cpp b/cheap/item.cpp
@@ -1068,8 +1068,8 @@ tPhrasalItem::hypothesize_edge(list<tItem*> path, unsigned int i)
       } else // every thing fine, create the new hypothesis
         new_hypothesis(hypo->decomposition, dtrs, indices);
     }
-    if (!hypo->inst_failed)
-      _hypotheses_path[path].push_back(hypo);
+    //    if (!hypo->inst_failed) // this will cause missing readings when used with grandparenting
+    _hypotheses_path[path].push_back(hypo);
   }
   if (i < _hypotheses_path[path].size()){
     if (_hypo_agendas[path].size() == 0)

diff --git a/cheap/options.cpp b/cheap/options.cpp
@@ -275,7 +275,7 @@ char* parse_options(int argc, char* argv[])
       case OPTION_PG:
         set_opt("opt_pg", 's');
         if(optarg != NULL) {
-          char *pos = strchr("sgta", optarg[0]);
+          const char *pos = strchr("sgta", optarg[0]);
           if(pos != NULL) {
             set_opt("opt_pg", optarg[0]);
           } else {

diff --git a/common/chunk-alloc.h b/common/chunk-alloc.h
@@ -25,6 +25,7 @@
 #define _CHUNK_ALLOC_H_
 
 #include <sys/types.h>
+#include <cstdio>
 
 /** The maximum number of chunks to allocate */
 #define MAX_CHUNKS 16000

diff --git a/common/dumper.h b/common/dumper.h
@@ -26,6 +26,7 @@
 #define _DUMPER_H_
 
 #include "errors.h"
+#include <cstdio>
 
 /** This class implements binary serialization of some basic data structures.
  * It dumps multi-byte data such as shorts or ints always in little endian

diff --git a/common/utility.h b/common/utility.h
@@ -28,6 +28,7 @@
 #include <cstring>
 #include <list> 
 #include <string>
+#include <cstdio>
 
 #define SET_SUBDIRECTORY "pet"
 

diff --git a/flop/flop.h b/flop/flop.h
@@ -27,6 +27,7 @@
 #include "symtab.h"
 #include "types.h"
 #include <list>
+#include <cstdio>
 
 /***************************/
 /* compile time parameters */