include文の記述を整理

core/CMakeLists.txt

@@ -46,8 +46,8 @@ elseif (UNIX)
 endif ()
 
 target_compile_options(core PRIVATE
-	$<$<CXX_COMPILER_ID:MSVC>: /W4 /O2 /utf-8>
-	$<$<CXX_COMPILER_ID:GNU>: -Wall -Wextra -O2>
+	$<$<CXX_COMPILER_ID:MSVC>: /W4 /O2 /utf-8 /DVOICEVOX_CORE_EXPORTS>
+	$<$<CXX_COMPILER_ID:GNU>: -Wall -Wextra -O2 -DVOICEVOX_CORE_EXPORTS>
 )
 target_include_directories(core
 	PRIVATE ${ONNXRUNTIME_DIR}/include

core/src/core.cpp

@@ -1,7 +1,6 @@
 #include <onnxruntime_cxx_api.h>
 
 #include <array>
-#include <cstdlib>
 #include <exception>
 #include <filesystem>
 #include <fstream>
@@ -11,7 +10,9 @@
 
 #include "nlohmann/json.hpp"
 
+#ifndef VOICEVOX_CORE_EXPORTS
 #define VOICEVOX_CORE_EXPORTS
+#endif  // VOICEVOX_CORE_EXPORTS
 #include "core.h"
 
 #define NOT_INITIALIZED_ERR "Call initialize() first."

core/src/engine.cpp

@@ -1,6 +1,6 @@
 #include <cstdlib>
-#include <exception>
 #include <memory>
+#include <stdexcept>
 #include <vector>
 
 #include "core.h"

core/src/engine/acoustic_feature_extractor.cpp

@@ -15,4 +15,4 @@ std::vector<OjtPhoneme> OjtPhoneme::convert(std::vector<OjtPhoneme> phonemes) {
   }
   return phonemes;
 }
-}
+}  // namespace voicevox::core::engine

core/src/engine/acoustic_feature_extractor.h

@@ -1,8 +1,6 @@
 #pragma once
 
-#include <iterator>
 #include <map>
-#include <random>
 #include <string>
 #include <vector>
 
@@ -41,4 +39,4 @@ class OjtPhoneme {
   long phoneme_id() const;
   static std::vector<OjtPhoneme> convert(std::vector<OjtPhoneme> phonemes);
 };
-}
+}  // namespace voicevox::core::engine

core/src/engine/full_context_label.cpp

@@ -1,6 +1,10 @@
 #include "full_context_label.h"
 
+#include <algorithm>
+#include <iostream>
+#include <iterator>
 #include <regex>
+#include <stdexcept>
 
 namespace voicevox::core::engine {
 std::string string_feature_by_regex(std::string pattern, std::string label) {

core/src/engine/kana_parser.cpp

@@ -1,8 +1,11 @@
 #include "kana_parser.h"
 
 #include <algorithm>
+#include <optional>
 #include <stdexcept>
 
+#include "mora_list.h"
+
 namespace voicevox::core::engine {
 static const std::map<std::string, MoraModel> text2mora_with_unvoice() {
   std::map<std::string, MoraModel> text2mora_with_unvoice;
@@ -160,4 +163,4 @@ std::string create_kana(std::vector<AccentPhraseModel> accent_phrases) {
   }
   return text;
 }
-}
+}  // namespace voicevox::core::engine

core/src/engine/kana_parser.h

@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "model.h"
-#include "mora_list.h"
 
 namespace voicevox::core::engine {
 const int LOOP_LIMIT = 300;
@@ -20,4 +19,4 @@ static const std::map<std::string, MoraModel> text2mora_with_unvoice();
 AccentPhraseModel text_to_accent_phrase(std::string phrase);
 std::vector<AccentPhraseModel> parse_kana(std::string text);
 std::string create_kana(std::vector<AccentPhraseModel> accent_phrases);
-}
+}  // namespace voicevox::core::engine

core/src/engine/model.h

@@ -33,4 +33,4 @@ struct AudioQueryModel {
   bool output_stereo;
   std::string kana;
 };
-}
+}  // namespace voicevox::core::engine

core/src/engine/mora_list.cpp

@@ -17,4 +17,4 @@ std::string mora2text(std::string mora) {
   }
   return text;
 }
-}
+}  // namespace voicevox::core::engine

core/src/engine/mora_list.h

@@ -198,4 +198,4 @@ static const std::vector<std::string> mora_list_minimum = {
 // clang-format on
 
 std::string mora2text(std::string mora);
-}
+}  // namespace voicevox::core::engine

core/src/engine/openjtalk.cpp

@@ -10,6 +10,8 @@
 #include <njd_set_unvoiced_vowel.h>
 #include <text2mecab.h>
 
+#include <stdexcept>
+
 namespace voicevox::core::engine {
 std::vector<std::string> OpenJTalk::extract_fullcontext(std::string text) {
   char buff[8192];
@@ -53,4 +55,4 @@ void OpenJTalk::clear() {
   NJD_clear(&njd);
   JPCommon_clear(&jpcommon);
 }
-}
+}  // namespace voicevox::core::engine

core/src/engine/openjtalk.h

@@ -9,7 +9,6 @@
 #include <mecab.h>
 #include <njd.h>
 
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -35,4 +34,4 @@ class OpenJTalk {
   void load(const std::string& dn_mecab);
   void clear();
 };
-}
+}  // namespace voicevox::core::engine

core/src/engine/synthesis_engine.cpp

@@ -1,8 +1,13 @@
 #include "synthesis_engine.h"
 
 #include <algorithm>
+#include <cmath>
 #include <iterator>
+#include <optional>
+#include <sstream>
+#include <stdexcept>
 
+#include "../core.h"
 #include "full_context_label.h"
 #include "mora_list.h"
 

core/src/engine/synthesis_engine.h

@@ -1,11 +1,9 @@
 #pragma once
 
 #include <memory>
-#include <sstream>
 #include <string>
 #include <vector>
 
-#include "../core.h"
 #include "acoustic_feature_extractor.h"
 #include "model.h"
 #include "openjtalk.h"