From 8e47c24851e9c217c1524b78848bea08fbe58ed2 Mon Sep 17 00:00:00 2001
From: Administrator <xbirdman@126.com>
Date: Fri, 17 May 2024 09:36:23 +0800
Subject: [PATCH] =?UTF-8?q?2024.5.16=20=E6=B5=8B=E8=AF=95=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kaldi/CMakeLists.txt     |  2 +-
 kaldi/base/kaldi-error.h |  6 +++---
 kaldi/base/kaldi-types.h | 28 ++++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kaldi/CMakeLists.txt b/kaldi/CMakeLists.txt
index 84b54e6..68a3ecd 100644
--- a/kaldi/CMakeLists.txt
+++ b/kaldi/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(kaldi-util
   util/simple-io-funcs.cc
   util/text-utils.cc
 )
-target_link_libraries(kaldi-util PUBLIC utils ${OPENFST_LIBRARYS})
+target_link_libraries(kaldi-util PUBLIC utils)
 
 add_library(kaldi-decoder
   lat/determinize-lattice-pruned.cc
diff --git a/kaldi/base/kaldi-error.h b/kaldi/base/kaldi-error.h
index d15656c..027a633 100644
--- a/kaldi/base/kaldi-error.h
+++ b/kaldi/base/kaldi-error.h
@@ -17,8 +17,8 @@
 #ifndef KALDI_BASE_KALDI_ERROR_H_
 #define KALDI_BASE_KALDI_ERROR_H_ 1
 
-#include "fst/log.h"
-
+#include "kaldi-types.h"
+#include <glog/logging.h>
 namespace kaldi {
 
 #define KALDI_WARN \
@@ -32,7 +32,7 @@ namespace kaldi {
 #define KALDI_ASSERT(condition) CHECK(condition)
 
 /***** PROGRAM NAME AND VERBOSITY LEVEL *****/
-
+using namespace kaldi;
 /// Called by ParseOptions to set base name (no directory) of the executing
 /// program. The name is printed in logging code along with every message,
 /// because in our scripts, we often mix together the stderr of many programs.
diff --git a/kaldi/base/kaldi-types.h b/kaldi/base/kaldi-types.h
index 8b4013e..46c7be7 100644
--- a/kaldi/base/kaldi-types.h
+++ b/kaldi/base/kaldi-types.h
@@ -41,22 +41,22 @@ typedef float BaseFloat;
 
 // for discussion on what to do if you need compile kaldi
 // without OpenFST, see the bottom of this this file
-#include <fst/types.h>
-
-namespace kaldi {
-using ::int16;
-using ::int32;
-using ::int64;
-using ::uint16;
-using ::uint32;
-using ::uint64;
-typedef float float32;
-typedef double double64;
-}  // end namespace kaldi
+//#include <fst/types.h>
+//
+//namespace kaldi {
+//using ::int16;
+//using ::int32;
+//using ::int64;
+//using ::uint16;
+//using ::uint32;
+//using ::uint64;
+//typedef float float32;
+//typedef double double64;
+//}  // end namespace kaldi
 
 // In a theoretical case you decide compile Kaldi without the OpenFST
 // comment the previous namespace statement and uncomment the following
-/*
+
 namespace kaldi {
   typedef int8_t   int8;
   typedef int16_t  int16;
@@ -70,6 +70,6 @@ namespace kaldi {
   typedef float    float32;
   typedef double   double64;
 }  // end namespace kaldi
-*/
+
 
 #endif  // KALDI_BASE_KALDI_TYPES_H_