From f853ec317f6af1b8c65cc5bd758371689c75118d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 19 Nov 2019 16:32:49 +0100 Subject: Extend loplugin:external to warn about classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend loplugin:external to warn about enums". Cases where free functions were moved into an unnamed namespace along with a class, to not break ADL, are in: filter/source/svg/svgexport.cxx sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xilink.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx All other free functions mentioning moved classes appear to be harmless and not give rise to (silent, even) ADL breakage. (One remaining TODO in compilerplugins/clang/external.cxx is that derived classes are not covered by computeAffectedTypes, even though they could also be affected by ADL-breakage--- but don't seem to be in any acutal case across the code base.) For friend declarations using elaborate type specifiers, like class C1 {}; class C2 { friend class C1; }; * If C2 (but not C1) is moved into an unnamed namespace, the friend declaration must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither qualified nor a template-id and the declaration is a function or an elaborated-type-specifier, the lookup to determine whether the entity has been previously declared shall not consider any scopes outside the innermost enclosing namespace.") * If C1 (but not C2) is moved into an unnamed namespace, the friend declaration must be changed too, see "elaborated-type-specifier friend not looked up in unnamed namespace". Apart from that, to keep changes simple and mostly mechanical (which should help avoid regressions), out-of-line definitions of class members have been left in the enclosing (named) namespace. But explicit specializations of class templates had to be moved into the unnamed namespace to appease "explicit specialization of template from unnamed namespace using unqualified-id in enclosing namespace". Also, accompanying declarations (of e.g. typedefs or static variables) that could arguably be moved into the unnamed namespace too have been left alone. And in some cases, mention of affected types in blacklists in other loplugins needed to be adapted. And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is not moved into an unnamed namespace (because it is declared in sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler doesn’t give this warning for types defined in the main .C file, as those are unlikely to have multiple definitions." () The warned-about classes also don't have multiple definitions in the given test, so disable the warning when including the .cxx. Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4 Reviewed-on: https://gerrit.libreoffice.org/83239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- ucbhelper/source/client/content.cxx | 8 +++++++- ucbhelper/source/client/proxydecider.cxx | 6 ++++++ ucbhelper/source/provider/contenthelper.cxx | 8 ++++++++ ucbhelper/source/provider/resultset.cxx | 11 +++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) (limited to 'ucbhelper/source') diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 9641a4e0a87a..5c698a2d7ba6 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -74,6 +74,8 @@ using namespace com::sun::star::uno; namespace ucbhelper { +namespace { + class EmptyInputStream : public ::cppu::WeakImplHelper< XInputStream > { public: @@ -86,6 +88,8 @@ public: virtual void SAL_CALL closeInput() override; }; +} + sal_Int32 EmptyInputStream::readBytes( Sequence< sal_Int8 > & data, sal_Int32 ) { @@ -116,6 +120,7 @@ void EmptyInputStream::closeInput() // class ContentEventListener_Impl. +namespace { class ContentEventListener_Impl : public cppu::OWeakObject, public XContentEventListener @@ -140,13 +145,14 @@ public: virtual void SAL_CALL disposing( const EventObject& Source ) override; }; +} // class Content_Impl. class Content_Impl : public salhelper::SimpleReferenceObject { -friend class ContentEventListener_Impl; +friend ContentEventListener_Impl; mutable OUString m_aURL; Reference< XComponentContext > m_xCtx; diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index b56ffbf76d71..062dd64b2887 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -62,6 +62,8 @@ namespace ucbhelper namespace proxydecider_impl { +namespace { + // A simple case ignoring wildcard matcher. class WildCard { @@ -77,9 +79,12 @@ public: bool Matches( const OUString & rStr ) const; }; +} typedef std::pair< WildCard, WildCard > NoProxyListEntry; +namespace { + class HostnameCache { typedef std::pair< OUString, OUString > HostListEntry; @@ -111,6 +116,7 @@ public: } }; +} class InternetProxyDecider_Impl : public cppu::WeakImplHelper< util::XChangesListener > diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index a7f39fced3d8..653f0d47e125 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -48,6 +48,8 @@ using namespace com::sun::star; namespace ucbhelper_impl { +namespace { + class PropertyEventSequence { uno::Sequence< beans::PropertyChangeEvent > m_aSeq; @@ -64,8 +66,12 @@ public: { m_aSeq.realloc( m_nPos ); return m_aSeq; } }; +} + typedef void* XPropertiesChangeListenerPtr; // -> Compiler problems! +namespace { + struct equalPtr { bool operator()( const XPropertiesChangeListenerPtr& rp1, @@ -83,6 +89,8 @@ struct hashPtr } }; +} + typedef std::unordered_map < XPropertiesChangeListenerPtr, diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 133b66a1da56..de8f868c8445 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -38,6 +38,8 @@ using namespace com::sun::star; namespace ucbhelper_impl { +namespace { + struct PropertyInfo { const char* pName; @@ -46,6 +48,8 @@ struct PropertyInfo const uno::Type& (*pGetCppuType)(); }; +} + static const uno::Type& sal_Int32_getCppuType() { return cppu::UnoType::get(); @@ -80,6 +84,7 @@ static const PropertyInfo aPropertyTable[] = // class PropertySetInfo +namespace { class PropertySetInfo : public cppu::OWeakObject, @@ -115,9 +120,13 @@ public: virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; }; +} + typedef cppu::OMultiTypeInterfaceContainerHelperVar PropertyChangeListenerContainer; +namespace { + class PropertyChangeListeners : public PropertyChangeListenerContainer { public: @@ -125,6 +134,8 @@ public: : PropertyChangeListenerContainer( rMtx ) {} }; +} + } // namespace ucbhelper_impl using namespace ucbhelper_impl; -- cgit