From f957dd9c7f29a7fadbcd8dce3c24b639d3d32b60 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Wed, 11 Jul 2018 10:47:42 +0200
Subject: [PATCH] Remove -Wno-reorder from examples/BUILD.gn.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:9251
Change-Id: I447469e94ad938eaaa628edcd1a57cdeac6ed603
Reviewed-on: https://webrtc-review.googlesource.com/88123
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23928}
---
 examples/BUILD.gn                          | 17 +----------------
 examples/peerconnection/client/main_wnd.cc |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index eee96839c6..b1f5114c3d 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -670,17 +670,6 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
 }
 
 if (is_linux || is_win) {
-  config("peerconnection_client_warnings_config") {
-    cflags = []
-    if (is_win && is_clang) {
-      cflags += [
-        # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6271
-        # for -Wno-reorder and -Wno-sign-compare
-        "-Wno-reorder",
-      ]
-    }
-  }
-
   rtc_executable("peerconnection_client") {
     testonly = true
     sources = [
@@ -727,7 +716,6 @@ if (is_linux || is_win) {
       ]
       deps += [ "//build/config/linux/gtk" ]
     }
-    configs += [ ":peerconnection_client_warnings_config" ]
 
     deps += [
       "../api:libjingle_peerconnection_api",
@@ -859,10 +847,7 @@ if (is_win || is_android) {
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
     if (is_win) {
-      configs += [
-        "//build/config/win:windowed",
-        ":peerconnection_client_warnings_config",
-      ]
+      configs += [ "//build/config/win:windowed" ]
     }
     deps = [
       "../api:libjingle_peerconnection_api",
diff --git a/examples/peerconnection/client/main_wnd.cc b/examples/peerconnection/client/main_wnd.cc
index c68d314a74..4d1c57e5de 100644
--- a/examples/peerconnection/client/main_wnd.cc
+++ b/examples/peerconnection/client/main_wnd.cc
@@ -81,8 +81,8 @@ MainWnd::MainWnd(const char* server,
       button_(NULL),
       listbox_(NULL),
       destroyed_(false),
-      callback_(NULL),
       nested_msg_(NULL),
+      callback_(NULL),
       server_(server),
       auto_connect_(auto_connect),
       auto_call_(auto_call) {