diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-19 16:32:49 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-22 12:57:32 +0100 |
commit | f853ec317f6af1b8c65cc5bd758371689c75118d (patch) | |
tree | b86d729bf9a9465ee619ead3b5635efa62a1804e /store/source | |
parent | f31d36966bceb90e261cbecd42634bde4448d527 (diff) |
Extend loplugin:external to warn about classes
...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 <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882>
"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
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "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."
(<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) 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 <sbergman@redhat.com>
Diffstat (limited to 'store/source')
-rw-r--r-- | store/source/lockbyte.cxx | 16 | ||||
-rw-r--r-- | store/source/storbios.cxx | 4 | ||||
-rw-r--r-- | store/source/store.cxx | 6 |
3 files changed, 26 insertions, 0 deletions
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index dfc7ad920a99..139857440dfb 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -143,6 +143,8 @@ storeError ILockBytes::flush() namespace store { +namespace { + struct FileHandle { oslFileHandle m_handle; @@ -315,6 +317,8 @@ protected: virtual ~FileLockBytes() override; }; +} + } // namespace store FileLockBytes::FileLockBytes (FileHandle const & rFile) @@ -442,6 +446,8 @@ storeError FileLockBytes::flush_Impl() namespace store { +namespace { + struct FileMapping { sal_uInt8 * m_pAddr; @@ -543,6 +549,8 @@ protected: virtual ~MappedLockBytes() override; }; +} + } // namespace store MappedLockBytes::MappedLockBytes (FileMapping const & rMapping) @@ -641,6 +649,8 @@ storeError MappedLockBytes::flush_Impl() namespace store { +namespace { + class MemoryLockBytes : public store::OStoreObject, public store::ILockBytes @@ -680,6 +690,8 @@ protected: virtual ~MemoryLockBytes() override; }; +} + } // namespace store MemoryLockBytes::MemoryLockBytes() @@ -804,6 +816,8 @@ storeError MemoryLockBytes::flush_Impl() namespace store { +namespace { + template< class T > struct ResourceHolder { typedef typename T::destructor_type destructor_type; @@ -838,6 +852,8 @@ template< class T > struct ResourceHolder } }; +} + storeError FileLockBytes_createInstance ( rtl::Reference< ILockBytes > & rxLockBytes, diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index 93e47d700841..a98f4e9a35a3 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -43,6 +43,8 @@ using namespace store; *======================================================================*/ #define STORE_MAGIC_SUPERBLOCK sal_uInt32(0x484D5343) +namespace { + struct OStoreSuperBlock { typedef OStorePageGuard G; @@ -139,6 +141,8 @@ struct OStoreSuperBlock } }; +} + /*======================================================================== * * SuperBlockPage interface. diff --git a/store/source/store.cxx b/store/source/store.cxx index 2f2b4bed4763..dfd41571e2dd 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -35,6 +35,9 @@ using rtl::Reference; namespace store { + +namespace { + /** Template helper class as type safe Reference to store_handle_type. */ template<class store_handle_type> @@ -52,6 +55,9 @@ public: static_cast<store_handle_type*>(0)); } }; + +} + } using namespace store; |