From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 1 May 2015 16:50:31 +0000 (+0100)
Subject: locale_classes.h (locale::facet): Delete copy operations in C++11 mode.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9cd006414899e263a12f5afb971f8db817dce85;p=gcc.git

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
---

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  <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 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;