diff options
| author | Colin Cross <ccross@android.com> | 2016-10-17 15:49:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-10-17 16:07:24 -0700 |
| commit | 41460f757de5135ccd0f7bbdc73d9606e30298e9 (patch) | |
| tree | 23557fdf6e4f0b5dd5557859d3652863a45bab4d /framework | |
| parent | 5f69b2705177ea1e15976e2b482fb49be911e7b0 (diff) | |
| download | VK-GL-CTS-41460f757de5135ccd0f7bbdc73d9606e30298e9.tar.gz VK-GL-CTS-41460f757de5135ccd0f7bbdc73d9606e30298e9.tar.bz2 VK-GL-CTS-41460f757de5135ccd0f7bbdc73d9606e30298e9.zip | |
Fix -Wc++11-narrowing warnings
The platform default -std=gnu++14 is going to be applied to NDK modules,
cast DE_OFFSET_OF to deUint32 instead of int to prevent a new -Werror
failure.
Test: mma -j
Change-Id: Ief5620089bc069006664d39d68090ea8310344ac
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/delibs/debase/deDefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/delibs/debase/deDefs.h b/framework/delibs/debase/deDefs.h index 9bd266352..c6d987aad 100644 --- a/framework/delibs/debase/deDefs.h +++ b/framework/delibs/debase/deDefs.h @@ -330,7 +330,7 @@ DE_INLINE deBool deGetTrue (void) { return DE_TRUE; } #define DE_SWAP(TYPE, A, B) do { TYPE _tmp_ = (A); (A) = (B); (B) = _tmp_; } while(deGetFalse()) /** Offset of a struct member. */ -#define DE_OFFSET_OF(STRUCT, MEMBER) ((int)(deUintptr)(deUint8*)&(((STRUCT*)0)->MEMBER)) +#define DE_OFFSET_OF(STRUCT, MEMBER) ((deUint32)(deUintptr)(deUint8*)&(((STRUCT*)0)->MEMBER)) /* Pointer size. */ #if defined(DE_PTR_SIZE) |