Stephan Bergmann 99076b47b7 Adapt to Clang 12 trunk cosmetic diagnostics changes
<https://github.com/llvm/llvm-project/commit/
e7f3e2103cdb567dda4fd52f81bf4bc07179f5a8> "Suppress printing template arguments
that match default template arguments of types by default" caused

> error: 'error' diagnostics seen but not expected:
>   File /home/sbergman/lo/core/compilerplugins/clang/test/makeshared.cxx Line 58: rather use make_shared than constructing from 'typename std::remove_reference<unique_ptr<int> &>::type' (aka 'std::unique_ptr<int>') [loplugin:makeshared]
>   File /home/sbergman/lo/core/compilerplugins/clang/test/makeshared.cxx Line 60: rather use make_shared than constructing from 'typename std::remove_reference<unique_ptr<int> &>::type' (aka 'std::unique_ptr<int>') [loplugin:makeshared]

in compilerplugins/clang/test/makeshared.cxx, and <https://github.com/llvm/
llvm-project/commit/5f12f4ff9078455cad9d4806da01f570553a5bf9> "Suppress printing
of inline namespace names in diagnostics by default, except where they are
necessary to disambiguate the target" caused

> error: 'note' diagnostics seen but not expected:
>   File /home/sbergman/lo/core/compilerplugins/clang/test/external.cxx Line 133: a function associating 'N::E' is declared here [loplugin:external]
>   File /home/sbergman/lo/core/compilerplugins/clang/test/external.cxx Line 140: a function associating 'N::E' is declared here [loplugin:external]
>   File /home/sbergman/lo/core/compilerplugins/clang/test/external.cxx Line 144: a function associating 'N::E' is declared here [loplugin:external]
>   File /home/sbergman/lo/core/compilerplugins/clang/test/external.cxx Line 167: a function associating 'N::E' is declared here [loplugin:external]
>   File /home/sbergman/lo/core/compilerplugins/clang/test/external.cxx Line 172: a function associating 'N::E' is declared here [loplugin:external]

Change-Id: If1ec798fd9876b5be058c63bcaca3e2a36c0dbb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105904
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-16 08:36:57 +01:00

64 lines
2.4 KiB
C++

/* -*- 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/.
*/
#include <sal/config.h>
#include <memory>
#include <o3tl/deleter.hxx>
#include <o3tl/sorted_vector.hxx>
struct S1
{
friend void test1();
private:
S1() {}
};
void test1()
{
// expected-error@+1 {{rather use make_shared than constructing from 'int *' [loplugin:makeshared]}}
std::shared_ptr<int> x(new int);
// expected-error@+1 {{rather use make_shared [loplugin:makeshared]}}
x.reset(new int);
// expected-error@+1 {{rather use make_shared than constructing from 'int *' [loplugin:makeshared]}}
x = std::shared_ptr<int>(new int);
// no warning expected
std::shared_ptr<int> y(new int, o3tl::default_delete<int>());
y.reset(new int, o3tl::default_delete<int>());
// no warning expected, no public constructor
std::shared_ptr<S1> z(new S1);
z.reset(new S1);
// no warning expected - this constructor takes an initializer-list, which make_shared does not support
auto a = std::shared_ptr<o3tl::sorted_vector<int>>(new o3tl::sorted_vector<int>({ 1, 2 }));
};
void test2()
{
// expected-error-re@+1 {{rather use make_shared than constructing from {{.*}}'unique_ptr<int>'{{.*}} [loplugin:makeshared]}}
std::shared_ptr<int> x = std::make_unique<int>(1);
// expected-error-re@+1 {{rather use make_shared than constructing from {{.*}}'unique_ptr<int>'{{.*}} [loplugin:makeshared]}}
x = std::make_unique<int>(1);
(void)x;
// expected-error-re@+1 {{rather use make_shared than constructing from {{.*}}'unique_ptr<int>'{{.*}} [loplugin:makeshared]}}
std::shared_ptr<int> y(std::make_unique<int>(1));
(void)y;
std::unique_ptr<int> u1;
// expected-error-re@+1 {{rather use make_shared than constructing from {{.+}} (aka 'std{{.*}}::unique_ptr<int{{.*}}>') [loplugin:makeshared]}}
std::shared_ptr<int> z = std::move(u1);
// expected-error-re@+1 {{rather use make_shared than constructing from {{.+}} (aka 'std{{.*}}::unique_ptr<int{{.*}}>') [loplugin:makeshared]}}
z = std::move(u1);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */