diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2020-09-10 18:47:08 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2020-09-10 18:47:08 +0100 |
commit | b6b9fd4af9ac46a8bb19a906e4c2afa14da91017 (patch) | |
tree | b83256b0ae6e5b5f81c9f83d5b67628c550b3f92 | |
parent | f9189e10889379ce9582592926db342109f57324 (diff) | |
download | gcc-b6b9fd4af9ac46a8bb19a906e4c2afa14da91017.zip gcc-b6b9fd4af9ac46a8bb19a906e4c2afa14da91017.tar.gz gcc-b6b9fd4af9ac46a8bb19a906e4c2afa14da91017.tar.bz2 |
libstdc++: Fix -Wnarrowing warnings
libstdc++-v3/ChangeLog:
* include/bits/fs_path.h (path::_List::type()): Avoid narrowing
conversion.
* include/std/chrono (operator+(const year&, const years&)):
Likewise.
-rw-r--r-- | libstdc++-v3/include/bits/fs_path.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/std/chrono | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index 26ddf0a..5a0917c 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -667,7 +667,7 @@ namespace __detail ~_List() = default; _Type type() const noexcept - { return _Type{reinterpret_cast<uintptr_t>(_M_impl.get()) & 0x3}; } + { return _Type(reinterpret_cast<uintptr_t>(_M_impl.get()) & 0x3); } void type(_Type) noexcept; diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index afee785..9b9fd2b 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -1591,7 +1591,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION friend constexpr year operator+(const year& __x, const years& __y) noexcept - { return year{int{__x} + __y.count()}; } + { return year{int{__x} + static_cast<int>(__y.count())}; } friend constexpr year operator+(const years& __x, const year& __y) noexcept |