birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[development] fixed ambiguous 'byte' type MSVC build error (#7184)

Browse Source 
- fully quality 'byte' type in AZStd::span
- remove unnecessary 'using namespace AZStd;' statement from AssetCatalog tests

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
This commit is contained in:
Scott Romero
2022-01-27 11:12:15 -08:00
committed by GitHub
parent b1492c1fb0
commit f7f17c98b4
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/std/containers/span.h
+2 -2
View File
@@ -189,11 +189,11 @@ namespace AZStd
// [span.objectrep], views of object representation // [span.objectrep], views of object representation
template <class ElementType, size_t Extent> template <class ElementType, size_t Extent>
auto as_bytes(span<ElementType, Extent> s) noexcept auto as_bytes(span<ElementType, Extent> s) noexcept
-> span<const byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>; -> span<const AZStd::byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>;
template <class ElementType, size_t Extent> template <class ElementType, size_t Extent>
auto as_writable_bytes(span<ElementType, Extent> s) noexcept auto as_writable_bytes(span<ElementType, Extent> s) noexcept
-> enable_if_t<!is_const_v<ElementType>, span<byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>>; -> enable_if_t<!is_const_v<ElementType>, span<AZStd::byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>>;
} // namespace AZStd } // namespace AZStd
Code/Framework/AzCore/AzCore/std/containers/span.inl
+6 -6
View File
@@ -197,18 +197,18 @@ namespace AZStd
template <class ElementType, size_t Extent> template <class ElementType, size_t Extent>
inline auto as_bytes(span<ElementType, Extent> s) noexcept inline auto as_bytes(span<ElementType, Extent> s) noexcept
-> span<const byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent> -> span<const AZStd::byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>
{ {
return span<const byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>( return span<const AZStd::byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>(
reinterpret_cast<const byte*>(s.data()), s.size_bytes()); reinterpret_cast<const AZStd::byte*>(s.data()), s.size_bytes());
} }
template <class ElementType, size_t Extent> template <class ElementType, size_t Extent>
inline auto as_writable_bytes(span<ElementType, Extent> s) noexcept inline auto as_writable_bytes(span<ElementType, Extent> s) noexcept
-> enable_if_t<!is_const_v<ElementType>, span<byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>> -> enable_if_t<!is_const_v<ElementType>, span<AZStd::byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>>
{ {
return span<byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>( return span<AZStd::byte, Extent == dynamic_extent ? dynamic_extent : sizeof(ElementType) * Extent>(
reinterpret_cast<byte*>(s.data()), s.size_bytes()); reinterpret_cast<AZStd::byte*>(s.data()), s.size_bytes());
} }
} // namespace AZStd } // namespace AZStd
Code/Framework/AzFramework/Tests/AssetCatalog.cpp
-1
View File
@@ -34,7 +34,6 @@
#include "AZTestShared/Utils/Utils.h" #include "AZTestShared/Utils/Utils.h"
using namespace AZStd;
using namespace AZ::Data; using namespace AZ::Data;
namespace UnitTest namespace UnitTest