diff options
author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-19 12:12:01 +0100 |
---|---|---|
committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-19 13:44:01 +0100 |
commit | 56ceb5db4eb3243d02c56c8cf21522d0373c28a9 (patch) | |
tree | dd895b1a8ba61e3d7d2f279a506ff8bf44f9624c /solenv | |
parent | c4e5b1b934fc3c59fb35ae6c02a0ddf8501a6d28 (diff) |
cppumaker: Work around problematic constant named "auto"
...which had been added all the way back in 2002 with
6cd0bbd8ce6ae2774fc61dacc0f81725ba038d79 "adding new file to HEAD" to constants
group css.drawing.CaptionEscapeDirection, which has meanwhile been published, so
no chance of cleaning that up.
But cppumaker already has a mechanism to work around problematic UNOIDL
identifiers, but which was only used for "new-style" entities when they got
introduced, mainly to avoid compatibility issues when retroactively changing the
code generated for existing entities.
But for C++ keywords, the generated code was always broken, so no harm in fixing
it, so introduce an additional IdentifierTranslateMode::KeywordsOnly and use
that at least for constants, to address the immediate issue.
(And with that, a hack can be removed from gb_UnoApiEmbindTarget__add_embind.)
Change-Id: I5cf62fd8b3b298dff2ec28452fb97b424a4ba473
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162305
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 59b2d07e149b..e4f92eb2d985 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -243,12 +243,10 @@ $(if $(filter offapi udkapi, $(1)),\ $(foreach hdr,$(3),$(eval $(call gb_UnoApiEmbindTarget__add_embind,$(1),$(2),$(hdr))))) endef -# CaptionEscapeDirection contains "auto" as a variable name.. so exclude that define gb_UnoApiEmbindTarget__add_embind -$(if $(filter-out CaptionEscapeDirection_embind, $(3)),\ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,unoembind,\ UnoApiHeadersTarget/$(1)/comprehensive/$(2)/$(3) \ -))) +)) endef |