diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 14:13:51 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 11:35:39 +0200 |
commit | c441672c0d99e08faa0667afd0ea804732b66c22 (patch) | |
tree | a69ad9cd03dfe97aac5cd1436ddf79ee56da9306 | |
parent | b83cc2b0108a4ec2087221a6150a66578788e5b4 (diff) |
cppuhelper: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...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>
-rw-r--r-- | include/cppuhelper/implbase.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/implbase1.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase10.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase11.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase12.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase13.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase2.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase3.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase4.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase5.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase6.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase7.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase8.hxx | 8 | ||||
-rw-r--r-- | include/cppuhelper/implbase9.hxx | 8 |
14 files changed, 114 insertions, 0 deletions
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index cfd68022c1e6..c946fb9cb052 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -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)); diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index 395723fe98e0..d274d661b4f7 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -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 diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index 75d4e10d1203..d4278d551c2a 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -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 diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 6082880d88e7..937705b3c2a5 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -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 diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index b126d925cb67..57c01184cb08 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -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 diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index 61dd1646dafd..21ab3d4017f1 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -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 diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index ce67df2c4671..ff1daf927375 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -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 diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index 11b78b19d585..4238739f78a1 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -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 diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index 2fe3d6757418..827f56eece37 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -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 diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index 8321089e3fd0..26cac953bfa9 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -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 diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index 50c07d0ae314..0b1db8d75bfc 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -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 diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index 9c6c041d7b69..157e1c945418 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -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 diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index 1c02b961c00d..c55198888bdf 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -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 diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index ece67befea76..a71fd7c7eba2 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -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 |