diff options
| -rw-r--r-- | compilerplugins/clang/test/cppunitassertequals.cxx | 6 | ||||
| -rw-r--r-- | compilerplugins/clang/test/cppunitassertequals.hxx | 23 | ||||
| -rw-r--r-- | solenv/clang-format/excludelist | 1 |
3 files changed, 5 insertions, 25 deletions
diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx b/compilerplugins/clang/test/cppunitassertequals.cxx index ea68a77e9628..401105465635 100644 --- a/compilerplugins/clang/test/cppunitassertequals.cxx +++ b/compilerplugins/clang/test/cppunitassertequals.cxx @@ -9,16 +9,20 @@ #include "sal/config.h" +#include <cstddef> + #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include "cppunitassertequals.hxx" +#include "rtl/ustring.hxx" #define TEST1 CPPUNIT_ASSERT(b1 == b2) #define TEST2(x) x +struct T { bool operator ==(T); }; + void test( bool b1, bool b2, OUString const & s1, OUString const & s2, T t, void * p, std::nullptr_t n, double d, int i) diff --git a/compilerplugins/clang/test/cppunitassertequals.hxx b/compilerplugins/clang/test/cppunitassertequals.hxx deleted file mode 100644 index 2448d64e93e7..000000000000 --- a/compilerplugins/clang/test/cppunitassertequals.hxx +++ /dev/null @@ -1,23 +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/. - */ - -#pragma once - -#include "sal/config.h" - -#include <cstddef> - -#include "rtl/ustring.hxx" - -struct T { bool operator ==(T); }; - -void test( - bool b1, bool b2, OUString const & s1, OUString const & s2, T t, void * p, std::nullptr_t n); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index a26ac1400c8d..f0f0773d7fef 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -1563,7 +1563,6 @@ compilerplugins/clang/test/commaoperator.cxx compilerplugins/clang/test/constmethod.cxx compilerplugins/clang/test/constparams.cxx compilerplugins/clang/test/cppunitassertequals.cxx -compilerplugins/clang/test/cppunitassertequals.hxx compilerplugins/clang/test/dodgyswitch.cxx compilerplugins/clang/test/expressionalwayszero.cxx compilerplugins/clang/test/faileddyncast.cxx |