From 8c3e6666c5ef612a20575e0ebcd5757ba21c47f8 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sun, 2 Aug 2020 09:02:30 +0200 Subject: WIN bridges: unify exception handling This is almost just refactoring, but with classes like type_info_ and __type_info, just following the code became tendious. I tried to come up with better names... and in the end included some minor code changes described below. This patch moves the "common" code for MSVC exception handling into msvc_shared/except.cxx. Still it contains a few small ifdefs, so it doesn't feel like clean separation, but a lot of duplicate code is dropped this way. The "major" code change for amd64 is the drop of the duplicate static RTTInfo object originally used by mscx_getRTTI and mscx_getRTTI_len, by merging of both functions into the single, new get() function to use a single std::find call. Change-Id: Ib07d40e2794cde79156be3324c80ccf21a6aa8ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102864 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- bridges/Library_cpp_uno.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bridges/Library_cpp_uno.mk') diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 0c6b255f52ad..67a66cdadfb5 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -271,6 +271,12 @@ $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/shared/vtables \ )) +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ + bridges/source/cpp_uno/msvc_shared/except \ +)) +endif + $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/shared/cppinterfaceproxy \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -- cgit