diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | 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 cb60e34..540413c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-05-01 Jonathan Wakely <jwakely@redhat.com> + * 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 f3898eb..7e098e3 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; |