草色烟光残照里，无言谁会凭阑意

恢复到C++20的概念

Author: scarsty

mlcc

@@ -59,7 +59,7 @@ Hanz2Piny::toPinyinFromUnicode (const Unicode hanzi_unicode, const bool with_ton
     // 不带声调
     vector<string> polyphone_list_without_tone;
     for (const auto& polyphone : polyphone_list_with_tone) {
-        const auto& iter = std::find_if(polyphone.cbegin(), polyphone.cend(), isdigit);
+        const auto& iter = std::ranges::find_if(polyphone.cbegin(), polyphone.cend(), isdigit);
         polyphone_list_without_tone.emplace_back(polyphone.cbegin(), iter);
     }
     return(polyphone_list_without_tone);

others/Hanz2Piny.cpp

@@ -534,7 +534,7 @@ int Engine::openAudio(int& freq, int& channels, int& size, int minsize, AudioCal
         channels = 2;
     }
     want.freq = freq;
-    want.format = AUDIO_S16;
+    want.format = AUDIO_F32;
     want.channels = channels;
     want.samples = size;
     want.callback = mixAudioCallback;

src/Engine.cpp

@@ -174,8 +174,8 @@ class Event
     }
 
     template <typename F, typename C, std::size_t... I>
-    typename std::enable_if<check_return_type<F, C, void>::value, void>::type
-    runner_impl(F f, C* c, const std::vector<int>& e, int& i, std::index_sequence<I...>)
+        requires check_return_type<F, C, void>::value
+    void runner_impl(F f, C* c, const std::vector<int>& e, int& i, std::index_sequence<I...>)
     {
         auto cur_i = i;
         i += sizeof...(I) + 1;
@@ -184,8 +184,8 @@ class Event
     }
 
     template <typename F, typename C, std::size_t... I>
-    typename std::enable_if<check_return_type<F, C, bool>::value, void>::type
-    runner_impl(F f, C* c, const std::vector<int>& e, int& i, std::index_sequence<I...>)
+        requires check_return_type<F, C, bool>::value
+    void runner_impl(F f, C* c, const std::vector<int>& e, int& i, std::index_sequence<I...>)
     {
         auto cur_i = i;
         i += sizeof...(I) + 1;

src/Event.h

@@ -7,8 +7,7 @@
 #include <array>
 #include <functional>
 
-template <typename T>
-int rModifier(const std::string& data_name, T getDataFromIndex, lua_State* L)
+int rModifier(auto data_name, auto getDataFromIndex, lua_State* L)
 {
     int index = lua_tonumber(L, 1);
     std::string name = lua_tostring(L, 2);

src/Script.cpp

@@ -38,16 +38,16 @@ class Script
     }
 
     template <typename F, typename C, std::size_t N>
-    static typename std::enable_if<check_return_type<F, C, void>::value, int>::type
-    runner(F f, C* c, const std::array<int, N>& e, lua_State* L)
+        requires check_return_type<F, C, void>::value
+    static int runner(F f, C* c, const std::array<int, N>& e, lua_State* L)
     {
         runner_impl(f, c, e, std::make_index_sequence<arg_counter<F, C>::value>{});
         return 0;
     }
 
     template <typename F, typename C, std::size_t N>
-    static typename std::enable_if<check_return_type<F, C, bool>::value, int>::type
-    runner(F f, C* c, const std::array<int, N>& e, lua_State* L)
+        requires check_return_type<F, C, bool>::value
+    static int runner(F f, C* c, const std::array<int, N>& e, lua_State* L)
     {
         lua_pushboolean(L, runner_impl(f, c, e, std::make_index_sequence<arg_counter<F, C>::value>{}));
         return 1;

src/Script.h

@@ -94,11 +94,11 @@
       <PreprocessorDefinitions>WITH_SMALLPOT1;WITH_NETWORK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../include;../mod;.;$(VCPKG_LIB_PATH)\x64-windows\include;../mlcc;../local/include</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <AdditionalOptions>/source-charset:utf-8 /execution-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <ScanSourceForModuleDependencies>true</ScanSourceForModuleDependencies>
-      <TranslateIncludes>true</TranslateIncludes>
+      <ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
+      <TranslateIncludes>false</TranslateIncludes>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>