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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
This commit is contained in:
Esteban Papp
2021-08-25 15:40:41 -07:00
parent fded2bafad b9daf7f7c3
commit ae4cfc3bd3
19 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Math/Guid.h
+5 -2
View File
@@ -8,18 +8,21 @@
#ifndef AZ_CORE_GUID_H
#define AZ_CORE_GUID_H 1
#ifndef GUID_DEFINED
#if defined(GUID_DEFINED)
#define GUID_FORMAT_DATA1 "lX"
#else
#define GUID_DEFINED
#include <AzCore/std/containers/array.h>
struct _GUID {
uint32_t Data1;
uint32_t Data1;
unsigned short Data2;
unsigned short Data3;
AZStd::array<unsigned char,8> Data4;
};
using GUID = _GUID;
#define GUID_FORMAT_DATA1 "X"
#endif // GUID_DEFINED
#if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_