Fix sat-solver build breaks

As reported in #1454 (comment)
opencog · Mar 11, 2023 · ffdf5d8 · ffdf5d8
1 parent 5ede90f
commit ffdf5d8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 Version 5.12.3 (XXX 2023)
- * Nothing yet.
+ * Assorted Atomese fixes.
+ * Fix SAT-solver build breaks.
 
 Version 5.12.2 (9 March 2023)
  * Fix null-pointer deref in Atomese code.

diff --git a/link-grammar/sat-solver/sat-encoder.cpp b/link-grammar/sat-solver/sat-encoder.cpp
@@ -1793,7 +1793,7 @@ Exp* SATEncoderConjunctionFreeSentences::PositionConnector2exp(const PositionCon
 bool SATEncoderConjunctionFreeSentences::sat_extract_links(Linkage lkg)
 {
   Disjunct *d;
-  int current_link = 0;
+  uint32_t current_link = 0;
 
   Exp **exp_word = (Exp **)alloca(_sent->length * sizeof(Exp *));
   memset(exp_word, 0, _sent->length * sizeof(Exp *));

diff --git a/link-grammar/sat-solver/sat-encoder.hpp b/link-grammar/sat-solver/sat-encoder.hpp
@@ -1,4 +1,5 @@
 #include "link-includes.h"
+#include "tokenize/word-structures.h"
 
 #include "word-tag.hpp"
 

diff --git a/link-grammar/sat-solver/word-tag.hpp b/link-grammar/sat-solver/word-tag.hpp
@@ -13,6 +13,7 @@ extern "C" {
 #include "error.h"                      // assert()
 #include "dict-common/dict-common.h"
 #include "tokenize/tok-structures.h"    // gword_set
+#include "tokenize/word-structures.h"   // X_node
 #include "tokenize/wordgraph.h"         // in_same_alternative()
 };