aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2013-04-28 11:51:59 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2013-04-28 12:51:59 +0100
commitd872e4aa7018fe79f1199e52bbcae0070128a561 (patch)
treef4ed7ad6e9805c528d695793d824f6e604ab2856
parentfe807059aaaf1be52e81513df1e25ef476c56b7d (diff)
downloadgcc-d872e4aa7018fe79f1199e52bbcae0070128a561.zip
gcc-d872e4aa7018fe79f1199e52bbcae0070128a561.tar.gz
gcc-d872e4aa7018fe79f1199e52bbcae0070128a561.tar.bz2
hashtable_policy.h (_Hashtable_ebo_helper): Fix comment.
* include/bits/hashtable_policy.h (_Hashtable_ebo_helper): Fix comment. * include/std/mutex (__recursive_mutex_base): Likewise. From-SVN: r198368
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/hashtable_policy.h4
-rw-r--r--libstdc++-v3/include/std/mutex2
3 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb2bb86..74af1e1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
2013-04-28 Jonathan Wakely <jwakely.gcc@gmail.com>
+ * include/bits/hashtable_policy.h (_Hashtable_ebo_helper): Fix
+ comment.
+ * include/std/mutex (__recursive_mutex_base): Likewise.
+
+2013-04-28 Jonathan Wakely <jwakely.gcc@gmail.com>
+
PR libstdc++/51365
* include/bits/shared_ptr_base (_Sp_ebo_helper): Helper class to
implement EBO safely.
diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h
index 1cf6cb2..1c76af0 100644
--- a/libstdc++-v3/include/bits/hashtable_policy.h
+++ b/libstdc++-v3/include/bits/hashtable_policy.h
@@ -844,8 +844,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* Primary class template _Hashtable_ebo_helper.
*
- * Helper class using EBO when it is not forbidden, type is not
- * final, and when it worth it, type is empty.
+ * Helper class using EBO when it is not forbidden (the type is not
+ * final) and when it is worth it (the type is empty.)
*/
template<int _Nm, typename _Tp,
bool __use_ebo = !__is_final(_Tp) && __is_empty(_Tp)>
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index 67f3418..3c666c1 100644
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -78,7 +78,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__mutex_base& operator=(const __mutex_base&) = delete;
};
- // Common base class for std::recursive_mutex and std::timed_recursive_mutex
+ // Common base class for std::recursive_mutex and std::recursive_timed_mutex
class __recursive_mutex_base
{
protected: