From 06d481d044ca7126f9d298ad9a4074fafde47ee8 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 28 Jan 2020 10:25:30 +0100 Subject: [PATCH] Fix 2 typos in documentation of libstdc++. PR libstdc++/93478 * include/std/atomic: Fix typo. * include/std/optional: Likewise. --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/std/atomic | 2 +- libstdc++-v3/include/std/optional | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e49950caf1e..03061e66333 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2020-01-28 Martin Liska + + PR libstdc++/93478 + * include/std/atomic: Fix typo. + * include/std/optional: Likewise. + 2020-01-27 Andrew Burgess * configure: Regenerate. diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 66c62381e6b..40f23bdfc96 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 struct atomic diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 09e7a7efca7..b920a1453ba 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&) -- 2.30.2