[libc++] Add deprecated attributes to many deprecated components
Summary: These deprecation warnings are opt-in: they are only enabled when the _LIBCXX_DEPRECATION_WARNINGS macro is defined, which is not the case by default. Note that this is a first step in the right direction, but I wasn't able to get an exhaustive list of all deprecated components per standard, so there's certainly stuff that's missing. The list of components this commit marks as deprecated is: in C++11: - auto_ptr, auto_ptr_ref - binder1st, binder2nd, bind1st(), bind2nd() - pointer_to_unary_function, pointer_to_binary_function, ptr_fun() - mem_fun_t, mem_fun1_t, const_mem_fun_t, const_mem_fun1_t, mem_fun() - mem_fun_ref_t, mem_fun1_ref_t, const_mem_fun_ref_t, const_mem_fun1_ref_t, mem_fun_ref() in C++14: - random_shuffle() in C++17: - unary_negate, binary_negate, not1(), not2() <rdar://problem/18168350> Reviewers: mclow.lists, EricWF Subscribers: christof, dexonsmith, llvm-commits Differential Revision: https://reviews.llvm.org/D48912 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@342843 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <memory>
|
||||
// <algorithm>
|
||||
|
||||
// template <class RandomAccessIterator>
|
||||
// void
|
||||
@@ -23,6 +23,8 @@
|
||||
// However, for backwards compatibility, if _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
|
||||
// is defined before including <algorithm>, then random_shuffle will be restored.
|
||||
|
||||
// REQUIRES: verify-support
|
||||
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
|
||||
#define _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
|
||||
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is dual licensed under the MIT and the University of Illinois Open
|
||||
// Source Licenses. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <algorithm>
|
||||
|
||||
// template <class RandomAccessIterator>
|
||||
// void
|
||||
// random_shuffle(RandomAccessIterator first, RandomAccessIterator last);
|
||||
//
|
||||
// template <class RandomAccessIterator, class RandomNumberGenerator>
|
||||
// void
|
||||
// random_shuffle(RandomAccessIterator first, RandomAccessIterator last,
|
||||
// RandomNumberGenerator& rand);
|
||||
|
||||
// REQUIRES: verify-support
|
||||
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
|
||||
#define _LIBCPP_ENABLE_DEPRECATION_WARNINGS
|
||||
#define _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
|
||||
#include "test_macros.h"
|
||||
|
||||
struct gen
|
||||
{
|
||||
std::ptrdiff_t operator()(std::ptrdiff_t n)
|
||||
{
|
||||
return n-1;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
int main()
|
||||
{
|
||||
#if TEST_STD_VER < 14
|
||||
// expected-no-diagnostics
|
||||
#else
|
||||
// expected-error@* 1 {{'random_shuffle<int *>' is deprecated}}
|
||||
// expected-error@* 1 {{'random_shuffle<int *, gen &>' is deprecated}}
|
||||
#endif
|
||||
int v[1] = {1};
|
||||
std::random_shuffle(&v[0], &v[1]);
|
||||
gen r;
|
||||
std::random_shuffle(&v[0], &v[1], r);
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is dual licensed under the MIT and the University of Illinois Open
|
||||
// Source Licenses. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <memory>
|
||||
//
|
||||
// template <class X>
|
||||
// class auto_ptr;
|
||||
//
|
||||
// class auto_ptr<void>;
|
||||
//
|
||||
// template <class X>
|
||||
// class auto_ptr_ref;
|
||||
//
|
||||
// Deprecated in C++11
|
||||
|
||||
// REQUIRES: verify-support
|
||||
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
|
||||
#define _LIBCPP_ENABLE_DEPRECATION_WARNINGS
|
||||
#define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
|
||||
|
||||
#include <memory>
|
||||
#include "test_macros.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
#if TEST_STD_VER < 11
|
||||
// expected-no-diagnostics
|
||||
#else
|
||||
// expected-error@* 1 {{'auto_ptr<int>' is deprecated}}
|
||||
// expected-error@* 1 {{'auto_ptr<void>' is deprecated}}
|
||||
// expected-error@* 1 {{'auto_ptr_ref<int>' is deprecated}}
|
||||
#endif
|
||||
typedef std::auto_ptr<int> AP;
|
||||
typedef std::auto_ptr<void> APV;
|
||||
typedef std::auto_ptr_ref<int> APR;
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is dual licensed under the MIT and the University of Illinois Open
|
||||
// Source Licenses. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
|
||||
// REQUIRES: verify-support
|
||||
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_DEPRECATION_WARNINGS
|
||||
// MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_BINDERS
|
||||
#define _LIBCPP_ENABLE_DEPRECATION_WARNINGS
|
||||
#define _LIBCPP_ENABLE_CXX17_REMOVED_BINDERS
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
#include "test_macros.h"
|
||||
|
||||
int identity(int v) { return v; }
|
||||
int sum(int a, int b) { return a + b; }
|
||||
|
||||
struct Foo {
|
||||
int const_zero() const { return 0; }
|
||||
int const_identity(int v) const { return v; }
|
||||
int zero() { return 0; }
|
||||
int identity(int v) { return v; }
|
||||
};
|
||||
|
||||
int main()
|
||||
{
|
||||
#if TEST_STD_VER < 11
|
||||
// expected-no-diagnostics
|
||||
#else
|
||||
// expected-error@* 1 {{'pointer_to_unary_function<int, int>' is deprecated}}
|
||||
// expected-error@* 1 {{'pointer_to_binary_function<int, int, int>' is deprecated}}
|
||||
// expected-error@* 1 {{'ptr_fun<int, int>' is deprecated}}
|
||||
// expected-error@* 1 {{'ptr_fun<int, int, int>' is deprecated}}
|
||||
|
||||
// expected-error@* 1 {{'mem_fun_t<int, Foo>' is deprecated}}
|
||||
// expected-error@* 1 {{'mem_fun1_t<int, Foo, int>' is deprecated}}
|
||||
// expected-error@* 1 {{'const_mem_fun_t<int, Foo>' is deprecated}}
|
||||
// expected-error@* 1 {{'const_mem_fun1_t<int, Foo, int>' is deprecated}}
|
||||
// expected-error@* 2 {{'mem_fun<int, Foo>' is deprecated}}
|
||||
// expected-error@* 2 {{'mem_fun<int, Foo, int>' is deprecated}}
|
||||
|
||||
// expected-error@* 1 {{'mem_fun_ref_t<int, Foo>' is deprecated}}
|
||||
// expected-error@* 1 {{'mem_fun1_ref_t<int, Foo, int>' is deprecated}}
|
||||
// expected-error@* 1 {{'const_mem_fun_ref_t<int, Foo>' is deprecated}}
|
||||
// expected-error@* 1 {{'const_mem_fun1_ref_t<int, Foo, int>' is deprecated}}
|
||||
// expected-error@* 2 {{'mem_fun_ref<int, Foo>' is deprecated}}
|
||||
// expected-error@* 2 {{'mem_fun_ref<int, Foo, int>' is deprecated}}
|
||||
#endif
|
||||
typedef std::pointer_to_unary_function<int, int> PUF;
|
||||
typedef std::pointer_to_binary_function<int, int, int> PBF;
|
||||
std::ptr_fun<int, int>(identity);
|
||||
std::ptr_fun<int, int, int>(sum);
|
||||
|
||||
typedef std::mem_fun_t<int, Foo> MFT0;
|
||||
typedef std::mem_fun1_t<int, Foo, int> MFT1;
|
||||
typedef std::const_mem_fun_t<int, Foo> CMFT0;
|
||||
typedef std::const_mem_fun1_t<int, Foo, int> CMFT1;
|
||||
std::mem_fun<int, Foo>(&Foo::zero);
|
||||
std::mem_fun<int, Foo, int>(&Foo::identity);
|
||||
std::mem_fun<int, Foo>(&Foo::const_zero);
|
||||
std::mem_fun<int, Foo, int>(&Foo::const_identity);
|
||||
|
||||
typedef std::mem_fun_ref_t<int, Foo> MFR0;
|
||||
typedef std::mem_fun1_ref_t<int, Foo, int> MFR1;
|
||||
typedef std::const_mem_fun_ref_t<int, Foo> CMFR0;
|
||||
typedef std::const_mem_fun1_ref_t<int, Foo, int> CMFR1;
|
||||
std::mem_fun_ref<int, Foo>(&Foo::zero);
|
||||
std::mem_fun_ref<int, Foo, int>(&Foo::identity);
|
||||
std::mem_fun_ref<int, Foo>(&Foo::const_zero);
|
||||
std::mem_fun_ref<int, Foo, int>(&Foo::const_identity);
|
||||
}
|
||||
Reference in New Issue
Block a user