AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suppress harmless MSVC C4324 warning in 64 bit builds

Browse Source 
We don't care about the change of size to wx_error_mgr struct due to the use
of __declspec(align()) in libjpeg headers, so just suppress the warning.
This commit is contained in:
Vadim Zeitlin 2015-09-27 14:40:38 +02:00
parent 76a75ddc6a
commit 0f4e5e9e28
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/imagjpeg.cpp
View File

@ -148,11 +148,26 @@ CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo )
// JPEG error manager:
#ifdef __VISUALC__
// We don't care about the size of this struct, but we still get an
// annoying warning C4324 here:
//
// 'wx_error_mgr' : structure was padded due to __declspec(align())
//
// and suppressing it seems to be the only way to avoid it.
#pragma warning(push)
#pragma warning(disable: 4324)
#endif
struct wx_error_mgr : public jpeg_error_mgr
{
jmp_buf setjmp_buffer; /* for return to caller */
};
#ifdef __VISUALC__
#pragma warning(pop)
#endif
/*
* Here's the routine that will replace the standard error_exit method:
*/