diff options
| -rw-r--r-- | compilerplugins/clang/store/finalprotected.cxx (renamed from compilerplugins/clang/finalprotected.cxx) | 0 | ||||
| -rw-r--r-- | compilerplugins/clang/test/finalprotected.cxx | 35 | ||||
| -rw-r--r-- | solenv/CompilerTest_compilerplugins_clang.mk | 1 | ||||
| -rw-r--r-- | solenv/clang-format/excludelist | 2 |
4 files changed, 1 insertions, 37 deletions
diff --git a/compilerplugins/clang/finalprotected.cxx b/compilerplugins/clang/store/finalprotected.cxx index 41b994c049d5..41b994c049d5 100644 --- a/compilerplugins/clang/finalprotected.cxx +++ b/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 |