aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2020-01-28 10:25:30 +0100
committerMartin Liska <mliska@suse.cz>2020-01-28 10:25:30 +0100
commit06d481d044ca7126f9d298ad9a4074fafde47ee8 (patch)
treee700fc8789b28baaef7dc46866e9a21c8cbba4a2
parentbff948aa337807260344c83ac9079d6386410094 (diff)
downloadgcc-06d481d044ca7126f9d298ad9a4074fafde47ee8.zip
gcc-06d481d044ca7126f9d298ad9a4074fafde47ee8.tar.gz
gcc-06d481d044ca7126f9d298ad9a4074fafde47ee8.tar.bz2
Fix 2 typos in documentation of libstdc++.
PR libstdc++/93478 * include/std/atomic: Fix typo. * include/std/optional: Likewise.
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/std/atomic2
-rw-r--r--libstdc++-v3/include/std/optional2
3 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e49950c..03061e6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-28 Martin Liska <mliska@suse.cz>
+
+ PR libstdc++/93478
+ * include/std/atomic: Fix typo.
+ * include/std/optional: Likewise.
+
2020-01-27 Andrew Burgess <andrew.burgess@embecosm.com>
* configure: Regenerate.
diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index 66c6238..40f23bd 100644
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -174,7 +174,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Generic atomic type, primary class template.
*
- * @tparam _Tp Type to be made atomic, must be trivally copyable.
+ * @tparam _Tp Type to be made atomic, must be trivially copyable.
*/
template<typename _Tp>
struct atomic
diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional
index 09e7a7e..b920a14 100644
--- a/libstdc++-v3/include/std/optional
+++ b/libstdc++-v3/include/std/optional
@@ -453,7 +453,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* Such a separate base class template is necessary in order to
* conditionally make copy/move constructors trivial.
*
- * When the contained value is trivally copy/move constructible,
+ * When the contained value is trivially copy/move constructible,
* the copy/move constructors of _Optional_base will invoke the
* trivial copy/move constructor of _Optional_payload. Otherwise,
* they will invoke _Optional_payload(bool, const _Optional_payload&)