From 4f3b266efe46fdac4cce737a26d3a87bc45fe54b Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Mon, 4 Jun 2018 16:04:57 +0200
Subject: [PATCH] src/training: Replace more proprietary BOOL8 by standard bool
 data type

Update also callers of the modified functions to use
false / true instead of 0 / 1.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 src/training/cntraining.cpp     | 6 +++---
 src/training/commontraining.cpp | 8 ++++----
 src/training/commontraining.h   | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/training/cntraining.cpp b/src/training/cntraining.cpp
index 55d520a5b..236440f4f 100644
--- a/src/training/cntraining.cpp
+++ b/src/training/cntraining.cpp
@@ -164,7 +164,7 @@ int main(int argc, char *argv[]) {
     Config.MagicSamples = CharSample->SampleCount;
     while (Config.MinSamples > 0.001) {
       ProtoList = ClusterSamples(Clusterer, &Config);
-      if (NumberOfProtos(ProtoList, 1, 0) > 0) {
+      if (NumberOfProtos(ProtoList, true, false) > 0) {
         break;
       } else {
         Config.MinSamples *= 0.95;
@@ -232,8 +232,8 @@ static void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
               " (%d significant protos"
               ", %d insignificant protos)\n",
               LabeledProto->Label, N,
-              NumberOfProtos(LabeledProto->List, 1, 0),
-              NumberOfProtos(LabeledProto->List, 0, 1));
+              NumberOfProtos(LabeledProto->List, true, false),
+              NumberOfProtos(LabeledProto->List, false, true));
       exit(1);
     }
     fprintf(File, "\n%s %d\n", LabeledProto->Label, N);
diff --git a/src/training/commontraining.cpp b/src/training/commontraining.cpp
index d888850c0..6aad70649 100644
--- a/src/training/commontraining.cpp
+++ b/src/training/commontraining.cpp
@@ -595,8 +595,8 @@ void CleanUpUnusedData(
 /*------------------------------------------------------------------------*/
 LIST RemoveInsignificantProtos(
     LIST ProtoList,
-    BOOL8 KeepSigProtos,
-    BOOL8 KeepInsigProtos,
+    bool KeepSigProtos,
+    bool KeepInsigProtos,
     int N)
 
 {
@@ -823,8 +823,8 @@ void AddToNormProtosList(
 }
 
 /*---------------------------------------------------------------------------*/
-int NumberOfProtos(LIST ProtoList, BOOL8 CountSigProtos,
-                   BOOL8 CountInsigProtos) {
+int NumberOfProtos(LIST ProtoList, bool CountSigProtos,
+                   bool CountInsigProtos) {
   int N = 0;
   PROTOTYPE* Proto;
 
diff --git a/src/training/commontraining.h b/src/training/commontraining.h
index 492ba93bb..95797bb95 100644
--- a/src/training/commontraining.h
+++ b/src/training/commontraining.h
@@ -142,8 +142,8 @@ CLUSTERER *SetUpForClustering(
 
 LIST RemoveInsignificantProtos(
     LIST        ProtoList,
-    BOOL8       KeepSigProtos,
-    BOOL8       KeepInsigProtos,
+    bool        KeepSigProtos,
+    bool        KeepInsigProtos,
     int         N);
 
 void CleanUpUnusedData(
@@ -181,8 +181,8 @@ void AddToNormProtosList(
 
 int NumberOfProtos(
     LIST        ProtoList,
-    BOOL8       CountSigProtos,
-    BOOL8       CountInsigProtos);
+    bool        CountSigProtos,
+    bool        CountInsigProtos);
 
 
 void allocNormProtos();