From 88b8b0da4bc1297b321fbaf8289580b71c51e73c Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 14 Aug 2012 00:05:56 +0000 Subject: [PATCH] Disable "new behavior: elements of array will be default initialized" warning. TBR=astor@webrtc.org TEST=trybots Review URL: https://webrtc-codereview.appspot.com/710012 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2609 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/common_types.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common_types.h b/src/common_types.h index ff84e6f6c1..e97c34d251 100644 --- a/src/common_types.h +++ b/src/common_types.h @@ -13,16 +13,22 @@ #include "typedefs.h" +#if defined(_MSC_VER) +// Disable "new behavior: elements of array will be default initialized" +// warning. Affects OverUseDetectorOptions. +#pragma warning(disable:4351) +#endif + #ifdef WEBRTC_EXPORT - #define WEBRTC_DLLEXPORT _declspec(dllexport) +#define WEBRTC_DLLEXPORT _declspec(dllexport) #elif WEBRTC_DLL - #define WEBRTC_DLLEXPORT _declspec(dllimport) +#define WEBRTC_DLLEXPORT _declspec(dllimport) #else - #define WEBRTC_DLLEXPORT +#define WEBRTC_DLLEXPORT #endif #ifndef NULL - #define NULL 0 +#define NULL 0 #endif #define RTP_PAYLOAD_NAME_SIZE 32