diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-09-22 09:44:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-09-22 11:01:05 +0200 |
| commit | 16e6f8ebe40aceec71466deb7b6b91c4eeb62007 (patch) | |
| tree | a2488d4d1dc5a25ec641fd7dcf25e87495dc5daf /include | |
| parent | d3094b98231730b8e6d863c6a2fc0dd62f3e991a (diff) | |
Avoid unique_ptr(nullptr_t) ctor for incomplete argument type
...hoping that this will avoid
> In file included from /home/tdf/lode/jenkins/workspace/lo_ubsan/sw/source/filter/ww8/wrtw8nds.cxx:25:
> In file included from /home/tdf/lode/jenkins/workspace/lo_ubsan/sw/source/filter/ww8/docxexport.hxx:23:
> In file included from /home/tdf/lode/jenkins/workspace/lo_ubsan/sw/source/filter/ww8/wrtww8.hxx:23:
> In file included from /home/tdf/lode/jenkins/workspace/lo_ubsan/include/sot/storage.hxx:24:
> In file included from /home/tdf/lode/jenkins/workspace/lo_ubsan/include/tools/stream.hxx:28:
> In file included from /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/memory:80:
> /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/unique_ptr.h:76:16: error: invalid application of 'sizeof' to an incomplete type 'sax_fastparser::FastAttributeList'
> static_assert(sizeof(_Tp)>0,
> ^~~~~~~~~~~
> /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<sax_fastparser::FastAttributeList>::operator()' requested here
> get_deleter()(__ptr);
> ^
> /home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/unique_ptr.h:233:45: note: in instantiation of member function 'std::unique_ptr<sax_fastparser::FastAttributeList, std::default_delete<sax_fastparser::FastAttributeList> >::~unique_ptr' requested here
> constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { }
> ^
> /home/tdf/lode/jenkins/workspace/lo_ubsan/include/sax/fshelper.hxx:33:34: note: forward declaration of 'sax_fastparser::FastAttributeList'
> namespace sax_fastparser { class FastAttributeList; }
> ^
(<https://ci.libreoffice.org/job/lo_ubsan/1767/>) with libstdc++ prior to
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;
h=c3ba63c314d61362f7c48c4feeefa13ea3978344> "PR libstdc++/87704 fix
unique_ptr(nullptr_t) constructors".
Change-Id: Ie3b86b83d0b0e70fe44e2b2022d410643e265fbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103139
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 67c5fc88f113..9aea58378660 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -138,7 +138,7 @@ public: OString const & AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, sal_Int16 eVRel = -1, - std::unique_ptr<sax_fastparser::FastAttributeList> m_pWrapAttrList = nullptr, + std::unique_ptr<sax_fastparser::FastAttributeList> m_pWrapAttrList = {}, const bool bOOxmlExport = false ); OString const & AddInlineSdrObject( const SdrObject& rObj, const bool bOOxmlExport ); virtual void AddSdrObjectVMLObject( const SdrObject& rObj) override; |