Export of internal Abseil changes

--
fb57c2d3598c81779c1bcd43c61b5abe748159c1 by Mark Barolak <mbar@google.com>:

Fix a typo in string_view.h

PiperOrigin-RevId: 272287080

--
69ac5819b786e50ec4c3e80847b868feb4ed94ca by Abseil Team <absl-team@google.com>:

Fix -Wmicrosoft-template on clang-cl.

PiperOrigin-RevId: 272260629
GitOrigin-RevId: fb57c2d3598c81779c1bcd43c61b5abe748159c1
Change-Id: Ib5b4486f6a991b340e640b0353fc89cae1100b14
This commit is contained in:
Abseil Team 2019-10-01 13:53:57 -07:00 committed by CJ Johnson
parent 8fe7214fe2
commit aad33fefaa
2 changed files with 3 additions and 3 deletions

View file

@ -134,9 +134,9 @@ class Flag {
bool InvokeValidator(const void* value) const {
return GetImpl()->InvokeValidator(value);
}
template <typename T>
template <typename T1>
inline bool IsOfType() const {
return GetImpl()->IsOftype<T>();
return GetImpl()->template IsOfType<T1>();
}
T Get() const { return GetImpl()->Get(); }
bool AtomicGet(T* v) const { return GetImpl()->AtomicGet(v); }

View file

@ -168,7 +168,7 @@ class string_view {
string_view( // NOLINT(runtime/explicit)
const std::basic_string<char, std::char_traits<char>, Allocator>&
str) noexcept
// This is implement in terms of `string_view(p, n)` so `str.size()`
// This is implemented in terms of `string_view(p, n)` so `str.size()`
// doesn't need to be reevaluated after `ptr_` is set.
: string_view(str.data(), str.size()) {}