mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppuhelper: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

Browse Source 
...by explicitly defaulting the copy/move functions (and, where needed in turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.  (For LIBO_INTERNAL_ONLY.)

Change-Id: I9da48559b083bdec9b1b4014634f6f3bfb1c3de3
Reviewed-on: https://gerrit.libreoffice.org/58107
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2018-07-26 14:13:51 +02:00
parent b83cc2b010
commit c441672c0d
14 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/cppuhelper/implbase.hxx
View File

@ -104,6 +104,11 @@ protected:
virtual ~WeakImplHelper() override {}
public:
WeakImplHelper(WeakImplHelper const &) = default;
WeakImplHelper(WeakImplHelper &&) = default;
WeakImplHelper & operator =(WeakImplHelper const &) = default;
WeakImplHelper & operator =(WeakImplHelper &&) = default;
css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override
{ return WeakImplHelper_query(aType, cd::get(), this, this); }
@ -152,6 +157,11 @@ protected:
virtual ~ImplInheritanceHelper() {}
public:
ImplInheritanceHelper(ImplInheritanceHelper const &) = default;
ImplInheritanceHelper(ImplInheritanceHelper &&) = default;
ImplInheritanceHelper & operator =(ImplInheritanceHelper const &) = default;
ImplInheritanceHelper & operator =(ImplInheritanceHelper &&) = default;
css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override
{
css::uno::Any ret(ImplHelper_queryNoXInterface(aType, cd::get(), this));

8
include/cppuhelper/implbase1.hxx
View File

@ -69,6 +69,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper1() = default;
ImplHelper1(ImplHelper1 const &) = default;
ImplHelper1(ImplHelper1 &&) = default;
ImplHelper1 & operator =(ImplHelper1 const &) = default;
ImplHelper1 & operator =(ImplHelper1 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase10.hxx
View File

@ -79,6 +79,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper10() = default;
ImplHelper10(ImplHelper10 const &) = default;
ImplHelper10(ImplHelper10 &&) = default;
ImplHelper10 & operator =(ImplHelper10 const &) = default;
ImplHelper10 & operator =(ImplHelper10 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase11.hxx
View File

@ -80,6 +80,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper11() = default;
ImplHelper11(ImplHelper11 const &) = default;
ImplHelper11(ImplHelper11 &&) = default;
ImplHelper11 & operator =(ImplHelper11 const &) = default;
ImplHelper11 & operator =(ImplHelper11 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase12.hxx
View File

@ -81,6 +81,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper12() = default;
ImplHelper12(ImplHelper12 const &) = default;
ImplHelper12(ImplHelper12 &&) = default;
ImplHelper12 & operator =(ImplHelper12 const &) = default;
ImplHelper12 & operator =(ImplHelper12 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase13.hxx
View File

@ -82,6 +82,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, ImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper13() = default;
ImplHelper13(ImplHelper13 const &) = default;
ImplHelper13(ImplHelper13 &&) = default;
ImplHelper13 & operator =(ImplHelper13 const &) = default;
ImplHelper13 & operator =(ImplHelper13 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase2.hxx
View File

@ -70,6 +70,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, ImplHelper2<Ifc1, Ifc2> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper2() = default;
ImplHelper2(ImplHelper2 const &) = default;
ImplHelper2(ImplHelper2 &&) = default;
ImplHelper2 & operator =(ImplHelper2 const &) = default;
ImplHelper2 & operator =(ImplHelper2 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase3.hxx
View File

@ -71,6 +71,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, ImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper3() = default;
ImplHelper3(ImplHelper3 const &) = default;
ImplHelper3(ImplHelper3 &&) = default;
ImplHelper3 & operator =(ImplHelper3 const &) = default;
ImplHelper3 & operator =(ImplHelper3 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase4.hxx
View File

@ -73,6 +73,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, ImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper4() = default;
ImplHelper4(ImplHelper4 const &) = default;
ImplHelper4(ImplHelper4 &&) = default;
ImplHelper4 & operator =(ImplHelper4 const &) = default;
ImplHelper4 & operator =(ImplHelper4 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase5.hxx
View File

@ -74,6 +74,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, ImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper5() = default;
ImplHelper5(ImplHelper5 const &) = default;
ImplHelper5(ImplHelper5 &&) = default;
ImplHelper5 & operator =(ImplHelper5 const &) = default;
ImplHelper5 & operator =(ImplHelper5 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase6.hxx
View File

@ -75,6 +75,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, ImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper6() = default;
ImplHelper6(ImplHelper6 const &) = default;
ImplHelper6(ImplHelper6 &&) = default;
ImplHelper6 & operator =(ImplHelper6 const &) = default;
ImplHelper6 & operator =(ImplHelper6 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase7.hxx
View File

@ -76,6 +76,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, ImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper7() = default;
ImplHelper7(ImplHelper7 const &) = default;
ImplHelper7(ImplHelper7 &&) = default;
ImplHelper7 & operator =(ImplHelper7 const &) = default;
ImplHelper7 & operator =(ImplHelper7 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase8.hxx
View File

@ -77,6 +77,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, ImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper8() = default;
ImplHelper8(ImplHelper8 const &) = default;
ImplHelper8(ImplHelper8 &&) = default;
ImplHelper8 & operator =(ImplHelper8 const &) = default;
ImplHelper8 & operator =(ImplHelper8 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE

8
include/cppuhelper/implbase9.hxx
View File

@ -78,6 +78,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, ImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
public:
#if defined LIBO_INTERNAL_ONLY
ImplHelper9() = default;
ImplHelper9(ImplHelper9 const &) = default;
ImplHelper9(ImplHelper9 &&) = default;
ImplHelper9 & operator =(ImplHelper9 const &) = default;
ImplHelper9 & operator =(ImplHelper9 &&) = default;
#endif
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
{ return ImplHelper_query( rType, cd::get(), this ); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE