From 5dffebc4d193a814923c098ee55d894f193747ed Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 16 Aug 2012 04:24:05 +0000
Subject: [PATCH] Remove disabling of warning 4351 from non-interface files.

This is handled in Chromium's build/common.gypi.

BUG=none
TEST=trybots

Review URL: https://webrtc-codereview.appspot.com/724008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2617 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../source/udp_transport_impl.cc              | 30 +++++++++----------
 .../main/source/codec_database.cc             | 15 +++++-----
 .../video_coding/main/source/frame_buffer.cc  |  5 ----
 .../video_coding/main/source/jitter_buffer.cc |  5 ----
 src/system_wrappers/source/thread_win.cc      |  5 ----
 src/system_wrappers/source/trace_impl.cc      |  4 +--
 .../test/auto_test/source/vie_autotest_win.cc |  2 --
 7 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/src/modules/udp_transport/source/udp_transport_impl.cc b/src/modules/udp_transport/source/udp_transport_impl.cc
index 7c82e73e23..e50db5d196 100644
--- a/src/modules/udp_transport/source/udp_transport_impl.cc
+++ b/src/modules/udp_transport/source/udp_transport_impl.cc
@@ -16,24 +16,22 @@
 #include <time.h>
 
 #if defined(_WIN32)
-    #include <winsock2.h>
-    #include <ws2tcpip.h>
-    // Disable warning for default initialized arrays on VS2005
-    #pragma warning(disable:4351)
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-    #include <arpa/inet.h>
-    #include <ctype.h>
-    #include <fcntl.h>
-    #include <netdb.h>
-    #include <net/if.h>
-    #include <netinet/in.h>
-    #include <stdlib.h>
-    #include <sys/ioctl.h>
-    #include <sys/socket.h>
-    #include <sys/time.h>
-    #include <unistd.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <unistd.h>
 #ifndef MAC_IPHONE
-    #include <net/if_arp.h>
+#include <net/if_arp.h>
 #endif
 #endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
 
diff --git a/src/modules/video_coding/main/source/codec_database.cc b/src/modules/video_coding/main/source/codec_database.cc
index 0a9604b693..05a560ced1 100644
--- a/src/modules/video_coding/main/source/codec_database.cc
+++ b/src/modules/video_coding/main/source/codec_database.cc
@@ -17,18 +17,17 @@
 #include "trace.h"
 
 #if defined(_WIN32)
-    // VS 2005: Don't warn for default initialized arrays. See help for more info.
-    // Don't warn for strncpy being unsecure.
-    // switch statement contains 'default' but no 'case' labels
-#pragma warning(disable:4351; disable:4996; disable:4065)
+// Don't warn for strncpy being unsecure.
+// switch statement contains 'default' but no 'case' labels
+#pragma warning(disable:4996; disable:4065)
 #endif
 
 // Supported codecs
-#ifdef  VIDEOCODEC_VP8
-    #include "vp8.h"
+#ifdef VIDEOCODEC_VP8
+#include "vp8.h"
 #endif
-#ifdef  VIDEOCODEC_I420
-    #include "i420.h"
+#ifdef VIDEOCODEC_I420
+#include "i420.h"
 #endif
 
 namespace webrtc
diff --git a/src/modules/video_coding/main/source/frame_buffer.cc b/src/modules/video_coding/main/source/frame_buffer.cc
index 6339b057df..abaadffb3a 100644
--- a/src/modules/video_coding/main/source/frame_buffer.cc
+++ b/src/modules/video_coding/main/source/frame_buffer.cc
@@ -14,11 +14,6 @@
 #include <cassert>
 #include <string.h>
 
-#if defined(_WIN32)
-    // VS 2005: Don't warn for default initialized arrays. See help for more info.
-    #pragma warning(disable:4351)
-#endif
-
 namespace webrtc {
 
 VCMFrameBuffer::VCMFrameBuffer()
diff --git a/src/modules/video_coding/main/source/jitter_buffer.cc b/src/modules/video_coding/main/source/jitter_buffer.cc
index ee6228c502..23f2e48f06 100644
--- a/src/modules/video_coding/main/source/jitter_buffer.cc
+++ b/src/modules/video_coding/main/source/jitter_buffer.cc
@@ -23,11 +23,6 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/trace.h"
 
-#if defined(_WIN32)
-    // VS 2005: Don't warn for default initialized arrays. See help for more info.
-    #pragma warning(disable:4351)
-#endif
-
 namespace webrtc {
 
 // Predicates used when searching for frames in the frame buffer list
diff --git a/src/system_wrappers/source/thread_win.cc b/src/system_wrappers/source/thread_win.cc
index 4599bedc27..07c586a87c 100644
--- a/src/system_wrappers/source/thread_win.cc
+++ b/src/system_wrappers/source/thread_win.cc
@@ -18,11 +18,6 @@
 #include "set_thread_name_win.h"
 #include "trace.h"
 
-#if defined(_WIN32)
-// VS 2005: Disable warnings for default initialized arrays.
-#pragma warning(disable:4351)
-#endif
-
 namespace webrtc {
 ThreadWindows::ThreadWindows(ThreadRunFunction func, ThreadObj obj,
                              ThreadPriority prio, const char* threadName)
diff --git a/src/system_wrappers/source/trace_impl.cc b/src/system_wrappers/source/trace_impl.cc
index b1b4f6fd4f..c6d9296651 100644
--- a/src/system_wrappers/source/trace_impl.cc
+++ b/src/system_wrappers/source/trace_impl.cc
@@ -26,9 +26,7 @@
 #define KEY_LEN_CHARS 31
 
 #ifdef _WIN32
-    #pragma warning(disable:4355)
-// VS 2005: Disable warnings for default initialized arrays.
-    #pragma warning(disable:4351)
+#pragma warning(disable:4355)
 #endif // _WIN32
 
 namespace webrtc {
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_win.cc b/src/video_engine/test/auto_test/source/vie_autotest_win.cc
index 051169d0f0..b722d3bad1 100755
--- a/src/video_engine/test/auto_test/source/vie_autotest_win.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_win.cc
@@ -30,8 +30,6 @@
 // Disable Visual studio warnings
 // 'this' : used in base member initializer list
 #pragma warning(disable: 4355)
-// new behavior: elements of array 'XXX' will be default initialized
-#pragma warning(disable: 4351)
 
 LRESULT CALLBACK ViEAutoTestWinProc(HWND hWnd, UINT uMsg, WPARAM wParam,
                                     LPARAM lParam) {