diff options
author | Jeffrey Walton <noloader@gmail.com> | 2016-01-25 19:28:55 -0500 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2016-01-25 19:28:55 -0500 |
commit | 1f1fecce882236919ab27d2d19def0a189ea92f9 (patch) | |
tree | aae7ba51fbfece006be7ca6781264a2ddc563d7a /secblock.h | |
parent | be8ad110989b8eb5bc446f4151d6c9f59888155f (diff) | |
download | cryptopp-git-1f1fecce882236919ab27d2d19def0a189ea92f9.tar.gz |
Cleared -Wcast-align (Issue 122)
Diffstat (limited to 'secblock.h')
-rw-r--r-- | secblock.h | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -409,23 +409,14 @@ public: private:
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wcast-align"
-#endif
-
#ifdef __BORLANDC__
T* GetAlignedArray() {return m_array;}
T m_array[S];
#else
- T* GetAlignedArray() {return (CRYPTOPP_BOOL_ALIGN16 && T_Align16) ? (T*)(((byte *)m_array) + (0-(size_t)m_array)%16) : m_array;}
+ T* GetAlignedArray() {return (CRYPTOPP_BOOL_ALIGN16 && T_Align16) ? (T*)(void *)(((byte *)m_array) + (0-(size_t)m_array)%16) : m_array;}
CRYPTOPP_ALIGN_DATA(8) T m_array[(CRYPTOPP_BOOL_ALIGN16 && T_Align16) ? S+8/sizeof(T) : S];
#endif
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic pop
-#endif
-
A m_fallbackAllocator;
bool m_allocated;
};
|