summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-19 16:32:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-22 12:57:32 +0100
commitf853ec317f6af1b8c65cc5bd758371689c75118d (patch)
treeb86d729bf9a9465ee619ead3b5635efa62a1804e /registry
parentf31d36966bceb90e261cbecd42634bde4448d527 (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 'registry')
-rw-r--r--registry/source/reflread.cxx26
-rw-r--r--registry/tools/regmerge.cxx4
2 files changed, 30 insertions, 0 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index b799e8b30ef2..501ad3096804 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -52,6 +52,8 @@ const sal_uInt16 majorVersion = 0x0001;
**************************************************************************/
+namespace {
+
class BlopObject
{
public:
@@ -148,6 +150,8 @@ public:
}
};
+}
+
BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len)
: m_bufferLen(len)
{
@@ -160,6 +164,8 @@ BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len)
**************************************************************************/
+namespace {
+
class StringCache
{
public:
@@ -172,6 +178,8 @@ public:
sal_uInt16 createString(const sal_uInt8* buffer); // throws std::bad_alloc
};
+}
+
StringCache::StringCache(sal_uInt16 size)
: m_stringTable(size)
, m_stringsCopied(0)
@@ -208,6 +216,8 @@ sal_uInt16 StringCache::createString(const sal_uInt8* buffer)
**************************************************************************/
+namespace {
+
class ConstantPool : public BlopObject
{
public:
@@ -242,6 +252,8 @@ public:
// throws std::bad_alloc
};
+}
+
sal_uInt32 ConstantPool::parseIndex()
{
m_pIndex.reset();
@@ -524,6 +536,8 @@ const sal_Unicode* ConstantPool::readStringConstant(sal_uInt16 index) const
**************************************************************************/
+namespace {
+
class FieldList : public BlopObject
{
public:
@@ -558,6 +572,7 @@ public:
const sal_Char* getFieldFileName(sal_uInt16 index) const;
};
+}
const sal_Char* FieldList::getFieldName(sal_uInt16 index) const
{
@@ -708,6 +723,8 @@ const sal_Char* FieldList::getFieldFileName(sal_uInt16 index) const
**************************************************************************/
+namespace {
+
class ReferenceList : public BlopObject
{
public:
@@ -737,6 +754,7 @@ public:
RTFieldAccess getReferenceAccess(sal_uInt16 index) const;
};
+}
const sal_Char* ReferenceList::getReferenceName(sal_uInt16 index) const
{
@@ -808,6 +826,8 @@ RTFieldAccess ReferenceList::getReferenceAccess(sal_uInt16 index) const
**************************************************************************/
+namespace {
+
class MethodList : public BlopObject
{
public:
@@ -850,6 +870,8 @@ private:
sal_uInt16 calcMethodParamIndex( const sal_uInt16 index ) const;
};
+}
+
sal_uInt16 MethodList::calcMethodParamIndex( const sal_uInt16 index ) const
{
return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));
@@ -1069,6 +1091,8 @@ const sal_Char* MethodList::getMethodDoku(sal_uInt16 index) const
**************************************************************************/
+namespace {
+
class TypeRegistryEntry: public BlopObject {
public:
std::unique_ptr<ConstantPool> m_pCP;
@@ -1086,6 +1110,8 @@ public:
typereg_Version getVersion() const;
};
+}
+
TypeRegistryEntry::TypeRegistryEntry(
const sal_uInt8* buffer, sal_uInt32 len):
BlopObject(buffer, len), m_refCount(1), m_nSuperTypes(0),
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 6b29fab9e448..409773a7017d 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -30,6 +30,8 @@
using namespace registry::tools;
+namespace {
+
class Options_Impl : public Options
{
bool m_bVerbose;
@@ -45,6 +47,8 @@ protected:
virtual bool initOptions_Impl(std::vector< std::string > & rArgs) override;
};
+}
+
void Options_Impl::printUsage_Impl() const
{
fprintf(stderr, "using: regmerge [-v|--verbose] mergefile mergeKeyName regfile_1 ... regfile_n\n");