2024.5.16 测试整体构建

kaldi/base/kaldi-error.h

@@ -32,7 +32,6 @@ 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.
@@ -41,10 +40,10 @@ void SetProgramName(const char* basename);
 
 /// This is set by util/parse-options.{h,cc} if you set --verbose=? option.
 /// Do not use directly, prefer {Get,Set}VerboseLevel().
-extern int32 g_kaldi_verbose_level;
+extern kaldi::int32 g_kaldi_verbose_level;
 
 /// Get verbosity level, usually set via command line '--verbose=' switch.
-inline int32 GetVerboseLevel() { return g_kaldi_verbose_level; }
+inline kaldi::int32 GetVerboseLevel() { return g_kaldi_verbose_level; }
 
 /// This should be rarely used, except by programs using Kaldi as library;
 /// command-line programs set the verbose level automatically from ParseOptions.