From 7ea407272484bb1083b50b4a7a3989967d0fd071 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 3 Feb 2022 13:20:36 +0100 Subject: [PATCH] stdex: Update Signed-off-by: Simon Rozman --- ZRCola.sln | 15 --------------- ZRCola/pch.h | 2 +- ZRColaCompile/pch.h | 2 +- ZRColaUtils.sln | 7 ------- lib/libZRCola/include/zrcola/character.h | 2 +- lib/libZRCola/include/zrcola/highlight.h | 2 +- lib/libZRCola/include/zrcola/language.h | 2 +- lib/libZRCola/include/zrcola/tag.h | 2 +- lib/libZRCola/include/zrcola/translate.h | 2 +- lib/libZRColaUI/include/zrcolaui/chargroup.h | 2 +- lib/libZRColaUI/include/zrcolaui/keyboard.h | 2 +- lib/stdex | 2 +- 12 files changed, 10 insertions(+), 32 deletions(-) diff --git a/ZRCola.sln b/ZRCola.sln index cd7d489..c3f751b 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}" EndProject Global @@ -80,18 +78,6 @@ Global {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.ActiveCfg = Release|x64 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.Build.0 = Release|x64 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|ARM64.Build.0 = Debug|ARM64 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.ActiveCfg = Debug|x64 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.Build.0 = Debug|x64 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|ARM64.ActiveCfg = Release|ARM64 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|ARM64.Build.0 = Release|ARM64 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.ActiveCfg = Debug|ARM64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.Build.0 = Debug|ARM64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -112,7 +98,6 @@ Global {D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} - {518777CC-0A59-4415-A12A-82751ED75343} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {990D8CF9-4457-4DC0-AA18-4968EF434741} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/ZRCola/pch.h b/ZRCola/pch.h index 13be1d2..f8c72f3 100644 --- a/ZRCola/pch.h +++ b/ZRCola/pch.h @@ -46,7 +46,7 @@ #include #include -#include +#include #if defined(__WXMSW__) #include diff --git a/ZRColaCompile/pch.h b/ZRColaCompile/pch.h index 6cb35ce..9a2a141 100644 --- a/ZRColaCompile/pch.h +++ b/ZRColaCompile/pch.h @@ -20,7 +20,7 @@ #include #pragma warning(pop) -#include +#include #include diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln index 0c280b4..b87721e 100644 --- a/ZRColaUtils.sln +++ b/ZRColaUtils.sln @@ -16,8 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaComp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstall", "ZRColaInstall\ZRColaInstall.vcxproj", "{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}" @@ -40,10 +38,6 @@ Global {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32 - {518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.ActiveCfg = Debug|Win32 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32 @@ -59,7 +53,6 @@ Global GlobalSection(NestedProjects) = preSolution {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} {D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} - {518777CC-0A59-4415-A12A-82751ED75343} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} {C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/lib/libZRCola/include/zrcola/character.h b/lib/libZRCola/include/zrcola/character.h index 2167d04..ba69e63 100644 --- a/lib/libZRCola/include/zrcola/character.h +++ b/lib/libZRCola/include/zrcola/character.h @@ -7,7 +7,7 @@ #include "common.h" -#include +#include #include #include #include diff --git a/lib/libZRCola/include/zrcola/highlight.h b/lib/libZRCola/include/zrcola/highlight.h index b4a89f2..c83ab4a 100644 --- a/lib/libZRCola/include/zrcola/highlight.h +++ b/lib/libZRCola/include/zrcola/highlight.h @@ -7,7 +7,7 @@ #include "common.h" -#include +#include #include diff --git a/lib/libZRCola/include/zrcola/language.h b/lib/libZRCola/include/zrcola/language.h index 7b8365c..d8b26ae 100644 --- a/lib/libZRCola/include/zrcola/language.h +++ b/lib/libZRCola/include/zrcola/language.h @@ -7,7 +7,7 @@ #include "common.h" -#include +#include #include #include #include diff --git a/lib/libZRCola/include/zrcola/tag.h b/lib/libZRCola/include/zrcola/tag.h index 1c39de6..3f554cd 100644 --- a/lib/libZRCola/include/zrcola/tag.h +++ b/lib/libZRCola/include/zrcola/tag.h @@ -7,7 +7,7 @@ #include "common.h" -#include +#include #include #include #include diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h index 8e90cc7..1e94370 100644 --- a/lib/libZRCola/include/zrcola/translate.h +++ b/lib/libZRCola/include/zrcola/translate.h @@ -8,7 +8,7 @@ #include "common.h" #include "language.h" -#include +#include #include #include #include diff --git a/lib/libZRColaUI/include/zrcolaui/chargroup.h b/lib/libZRColaUI/include/zrcolaui/chargroup.h index cb2266a..ed12374 100644 --- a/lib/libZRColaUI/include/zrcolaui/chargroup.h +++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h @@ -7,7 +7,7 @@ #include -#include +#include #include #include #include diff --git a/lib/libZRColaUI/include/zrcolaui/keyboard.h b/lib/libZRColaUI/include/zrcolaui/keyboard.h index ae5ac8e..3803ea9 100644 --- a/lib/libZRColaUI/include/zrcolaui/keyboard.h +++ b/lib/libZRColaUI/include/zrcolaui/keyboard.h @@ -7,7 +7,7 @@ #include -#include +#include #include #pragma warning(push) diff --git a/lib/stdex b/lib/stdex index 6b9972b..4521ea8 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit 6b9972b0a625943ba658d45db62d31189de83703 +Subproject commit 4521ea8f00379099888884bc8aa3c7a3894d6b9f