compilerplugins/clang/test/finalprotected.cxx | 35 --------------------------
solenv/CompilerTest_compilerplugins_clang.mk | 1
solenv/clang-format/excludelist | 2 -
3 files changed, 1 insertion(+), 37 deletions(-)
New commits:
commit bfe589d13fafc0801d709a79144114d289958cae
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Nov 17 10:04:35 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Nov 17 12:48:20 2021 +0100
remove loplugin:finalprotected
It just forces a custom rule that serves no real purpose. There's
no technical difference. If one day a class gets inherited from
then this information will be lost/incorrect. And mixing access
on a virtual function is poor style.
Change-Id: I0c27db8d694ad191a118d4e1d3d4a240e00456fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125337
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/compilerplugins/clang/finalprotected.cxx
b/compilerplugins/clang/store/finalprotected.cxx
similarity index 100%
rename from compilerplugins/clang/finalprotected.cxx
rename to compilerplugins/clang/store/finalprotected.cxx
diff --git a/compilerplugins/clang/test/finalprotected.cxx
b/compilerplugins/clang/test/finalprotected.cxx
deleted file mode 100644
index c15564874447..000000000000
--- a/compilerplugins/clang/test/finalprotected.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-
-class S final {
-protected:
- void f(int f) { f1 = f; } // expected-error {{final class should not have
protected members - convert them to private [loplugin:finalprotected]}}
- int f1; // expected-error {{final class should not have protected
members - convert them to private [loplugin:finalprotected]}}
-public:
- void g();
- int g1;
-private:
- void h();
- int h1;
-};
-
-class S2 {
-protected:
- void f(int f) { f1 = f; }
- int f1;
-public:
- void g();
- int g1;
-private:
- void h();
- int h1;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/solenv/CompilerTest_compilerplugins_clang.mk
b/solenv/CompilerTest_compilerplugins_clang.mk
index 53f51e0759ba..75afd793843e 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -38,7 +38,6 @@ $(eval $(call
gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
compilerplugins/clang/test/external \
compilerplugins/clang/test/faileddyncast \
compilerplugins/clang/test/fakebool \
- compilerplugins/clang/test/finalprotected \
compilerplugins/clang/test/flatten \
compilerplugins/clang/test/fragiledestructor \
compilerplugins/clang/test/getstr \
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2608eb588055..1fd086ffb285 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -1484,7 +1484,6 @@ compilerplugins/clang/externandnotdefined.cxx
compilerplugins/clang/faileddyncast.cxx
compilerplugins/clang/fakebool.cxx
compilerplugins/clang/finalclasses.cxx
-compilerplugins/clang/finalprotected.cxx
compilerplugins/clang/flatten.cxx
compilerplugins/clang/fragiledestructor.cxx
compilerplugins/clang/functionaddress.hxx
@@ -1541,6 +1540,7 @@ compilerplugins/clang/store/deadclass.cxx
compilerplugins/clang/store/defaultparams.cxx
compilerplugins/clang/store/deletedspecial.cxx
compilerplugins/clang/store/derivedclass.cxx
+compilerplugins/clang/store/finalprotected.cxx
compilerplugins/clang/store/findoncontainer.cxx
compilerplugins/clang/store/fpcomparison.cxx
compilerplugins/clang/store/lclstaticfix.cxx
