diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-11-01 08:36:37 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-11-01 13:02:08 +0100 |
commit | 1fcf4d0565d83498183bd778b8fd76612d680466 (patch) | |
tree | 9758e59daa6a5121fe045b0a06bfa77fe3eb87c8 /vcl/inc/win | |
parent | e99a09f857b1aa4a98052dc9dd79eba70186bcff (diff) |
Fix ambiguous member lookup (clang-cl)
> vcl/win/gdi/salbmp.cxx(179,9): error: member 'getSystemDependentData' found in multiple base classes of different types
> getSystemDependentData<SystemDependentData_GdiPlusBitmap>());
> ^
> vcl/inc\salbmp.hxx(138,24): note: member found by ambiguous name lookup
> std::shared_ptr<T> getSystemDependentData() const
> ^
> include\basegfx/utils/systemdependentdata.hxx(107,39): note: member found by ambiguous name lookup
> SystemDependentData_SharedPtr getSystemDependentData(size_t hash_code) const;
> ^
> vcl/win/gdi/salbmp.cxx(217,9): error: member 'addOrReplaceSystemDependentData' found in multiple base classes of different types
> addOrReplaceSystemDependentData<SystemDependentData_GdiPlusBitmap>(
> ^
> vcl/inc\salbmp.hxx(147,24): note: member found by ambiguous name lookup
> std::shared_ptr<T> addOrReplaceSystemDependentData(Args&&... args) const
> ^
> include\basegfx/utils/systemdependentdata.hxx(106,14): note: member found by ambiguous name lookup
> void addOrReplaceSystemDependentData(SystemDependentData_SharedPtr& rData);
> ^
Change-Id: I8b8d034e4e3a0bcd4462f3b28246b219632960ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142089
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/inc/win')
-rw-r--r-- | vcl/inc/win/salbmp.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index d8d00e727f76..c83b1675331f 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -61,6 +61,11 @@ public: WinSalBitmap(); virtual ~WinSalBitmap() override; + using SalBitmap::addOrReplaceSystemDependentData; + using SalBitmap::getSystemDependentData; + using SystemDependentDataHolder::addOrReplaceSystemDependentData; + using SystemDependentDataHolder::getSystemDependentData; + public: bool Create( HANDLE hBitmap ); |