diff options
| author | Abseil Team <absl-team@google.com> | 2018-02-01T04·34-0800 |
|---|---|---|
| committer | jueminyang <jueminyang@google.com> | 2018-02-01T15·36-0500 |
| commit | 0ec11bad6fc18822e851b25344f027491cc85746 (patch) | |
| tree | 7122b7b3409bd457bc1edb1f1b61cd3a892feeb5 /absl/types | |
| parent | 8a401394b8f71da745b3ad6e7c783d7f13ef5428 (diff) | |
Changes imported from Abseil "staging" branch:
- 06abebb2bdb201c572da209fc7f781d6bd774d6b Documentation fixes for `absl::optional`. by Abseil Team <absl-team@google.com> - 42adc4c4daade2e070dc337e94d8851a1fd4bead Rolling back the previous change because `__has_warning`... by Xiaoyi Zhang <zhangxy@google.com> - 02a42cbaa97d82ee7942bc498538359185d75087 Remove literal UTF8 strings in abseil code to avoid file ... by Jon Cohen <cohenjon@google.com> GitOrigin-RevId: 06abebb2bdb201c572da209fc7f781d6bd774d6b Change-Id: I4f4659c2e7ca6fc585b6c089bcf20ca61aced75d
Diffstat (limited to 'absl/types')
| -rw-r--r-- | absl/types/any.h | 4 | ||||
| -rw-r--r-- | absl/types/optional.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/absl/types/any.h b/absl/types/any.h index cee9cd324fc9..760a160e7562 100644 --- a/absl/types/any.h +++ b/absl/types/any.h @@ -304,7 +304,7 @@ class any { // object of type `VT` with the arguments `std::forward<Args>(args)...`, and // returning a reference to the new contained value. // - // Note: If an exception is thrown during the call to `VT`’s constructor, + // Note: If an exception is thrown during the call to `VT`'s constructor, // `*this` does not contain a value, and any previously contained value has // been destroyed. template < @@ -325,7 +325,7 @@ class any { // `initilizer_list, std::forward<Args>(args)...`, and returning a reference // to the new contained value. // - // Note: If an exception is thrown during the call to `VT`’s constructor, + // Note: If an exception is thrown during the call to `VT`'s constructor, // `*this` does not contain a value, and any previously contained value has // been destroyed. The function shall not participate in overload resolution // unless `is_copy_constructible_v<VT>` is `true` and diff --git a/absl/types/optional.h b/absl/types/optional.h index 9858a9749766..07e439448dcc 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -492,11 +492,11 @@ class optional : private optional_internal::optional_data<T>, // Constructors - // Constructs a default-constructed `optional` holding the empty value, NOT a - // default constructed `T`. + // Constructs an `optional` holding an empty value, NOT a default constructed + // `T`. constexpr optional() noexcept {} - // Construct an `optional` initialized with `nullopt` to hold an empty value. + // Constructs an `optional` initialized with `nullopt` to hold an empty value. constexpr optional(nullopt_t) noexcept {} // NOLINT(runtime/explicit) // Copy constructor, standard semantics |