From e9cd006414899e263a12f5afb971f8db817dce85 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 1 May 2015 17:50:31 +0100 Subject: [PATCH] locale_classes.h (locale::facet): Delete copy operations in C++11 mode. * include/bits/locale_classes.h (locale::facet): Delete copy operations in C++11 mode. From-SVN: r222694 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/bits/locale_classes.h | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cb60e3416ad..540413c47b4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-05-01 Jonathan Wakely + * include/bits/locale_classes.h (locale::facet): Delete copy + operations in C++11 mode. + * include/bits/alloc_traits.h (__alloc_rebind): Change parameter name. * acinclude.m4 (GLIBCXX_ENABLE_FILESYSTEM_TS): Disable for solaris. diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h index f3898ebf7b2..7e098e3d128 100644 --- a/libstdc++-v3/include/bits/locale_classes.h +++ b/libstdc++-v3/include/bits/locale_classes.h @@ -428,6 +428,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_CONST static const char* _S_get_c_name() throw(); +#if __cplusplus < 201103L + private: + facet(const facet&); // Not defined. + + facet& + operator=(const facet&); // Not defined. +#else + facet(const facet&) = delete; + + facet& + operator=(const facet&) = delete; +#endif + private: void _M_add_reference() const throw() @@ -448,11 +461,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - facet(const facet&); // Not defined. - - facet& - operator=(const facet&); // Not defined. - class __shim; const facet* _M_sso_shim(const id*) const; -- 2.30.2