[patch] Fix non-reserved names in <atomic>

Jonathan Wakely jwakely@redhat.com
Tue Apr 15 18:29:00 GMT 2014


The parameters names should all be reserved names.
Also remove some trailing whitespace at the end of lines.

Tested x86_64-linux, committed to trunk.
-------------- next part --------------
commit b6e5e08880da7d80c1f14c132bd4bd8eed301205
Author: Jonathan Wakely <accu@kayari.org>
Date:   Tue Apr 15 19:01:36 2014 +0100

    	* include/std/atomic: Uglify parameter names.

diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index 1b8e445..be7d0be 100644
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -200,43 +200,43 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       { return __atomic_is_lock_free(sizeof(_M_i), nullptr); }
 
       void
-      store(_Tp __i, memory_order _m = memory_order_seq_cst) noexcept
-      { __atomic_store(&_M_i, &__i, _m); }
+      store(_Tp __i, memory_order __m = memory_order_seq_cst) noexcept
+      { __atomic_store(&_M_i, &__i, __m); }
 
       void
-      store(_Tp __i, memory_order _m = memory_order_seq_cst) volatile noexcept
-      { __atomic_store(&_M_i, &__i, _m); }
+      store(_Tp __i, memory_order __m = memory_order_seq_cst) volatile noexcept
+      { __atomic_store(&_M_i, &__i, __m); }
 
       _Tp
-      load(memory_order _m = memory_order_seq_cst) const noexcept
+      load(memory_order __m = memory_order_seq_cst) const noexcept
       { 
         _Tp tmp;
-	__atomic_load(&_M_i, &tmp, _m); 
+	__atomic_load(&_M_i, &tmp, __m);
 	return tmp;
       }
 
       _Tp
-      load(memory_order _m = memory_order_seq_cst) const volatile noexcept
+      load(memory_order __m = memory_order_seq_cst) const volatile noexcept
       { 
         _Tp tmp;
-	__atomic_load(&_M_i, &tmp, _m); 
+	__atomic_load(&_M_i, &tmp, __m);
 	return tmp;
       }
 
       _Tp
-      exchange(_Tp __i, memory_order _m = memory_order_seq_cst) noexcept
+      exchange(_Tp __i, memory_order __m = memory_order_seq_cst) noexcept
       { 
         _Tp tmp;
-	__atomic_exchange(&_M_i, &__i, &tmp, _m); 
+	__atomic_exchange(&_M_i, &__i, &tmp, __m);
 	return tmp;
       }
 
       _Tp
       exchange(_Tp __i, 
-	       memory_order _m = memory_order_seq_cst) volatile noexcept
+	       memory_order __m = memory_order_seq_cst) volatile noexcept
       { 
         _Tp tmp;
-	__atomic_exchange(&_M_i, &__i, &tmp, _m); 
+	__atomic_exchange(&_M_i, &__i, &tmp, __m);
 	return tmp;
       }
 
@@ -244,14 +244,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       compare_exchange_weak(_Tp& __e, _Tp __i, memory_order __s, 
 			    memory_order __f) noexcept
       {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, true, __s, __f); 
+	return __atomic_compare_exchange(&_M_i, &__e, &__i, true, __s, __f);
       }
 
       bool
       compare_exchange_weak(_Tp& __e, _Tp __i, memory_order __s, 
 			    memory_order __f) volatile noexcept
       {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, true, __s, __f); 
+	return __atomic_compare_exchange(&_M_i, &__e, &__i, true, __s, __f);
       }
 
       bool
@@ -270,14 +270,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       compare_exchange_strong(_Tp& __e, _Tp __i, memory_order __s, 
 			      memory_order __f) noexcept
       {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, false, __s, __f); 
+	return __atomic_compare_exchange(&_M_i, &__e, &__i, false, __s, __f);
       }
 
       bool
       compare_exchange_strong(_Tp& __e, _Tp __i, memory_order __s, 
 			      memory_order __f) volatile noexcept
       {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, false, __s, __f); 
+	return __atomic_compare_exchange(&_M_i, &__e, &__i, false, __s, __f);
       }
 
       bool



More information about the Libstdc++ mailing list