commit 071bca9bd0bf1727f3b36ecfe697e0b2766e7f0f
author Daniele Di Proietto <ddiproietto@google.com> Fri Sep 02 21:40:13 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 02 21:40:13 2022 +0000
tree 534fe1f9828cb6fd3abc8866813eeeabf992d29b
parent 86567a744ea120fac21cbb81cb09e94b700415f6
parent d43b2979fc42854c0cdb76e4848bef25b8033439

Merge changes I43fb6286,Ie756cae5,Id9382f81

* changes:
  Fix clang-cl warnings on gtest_and_gmock
  Remove wrong assert in win_find_msvc.py
  Ignore unused param on windows and fuchsia

gn/standalone/toolchain/win_find_msvc.py

diff --git a/gn/standalone/toolchain/win_find_msvc.py b/gn/standalone/toolchain/win_find_msvc.py
index 179ae79..1628c07 100644
--- a/gn/standalone/toolchain/win_find_msvc.py
+++ b/gn/standalone/toolchain/win_find_msvc.py
@@ -34,7 +34,6 @@
 def ver_to_tuple(ver_str):
   """Turns '10.1.2' into [10,1,2] so it can be compared using > """
   parts = [int(x) for x in ver_str.split('.')]
-  assert (len(parts) == 4)
   return parts
 
 

src/base/unix_socket.cc

diff --git a/src/base/unix_socket.cc b/src/base/unix_socket.cc
index 1ebae83..be3955a 100644
--- a/src/base/unix_socket.cc
+++ b/src/base/unix_socket.cc
@@ -341,6 +341,8 @@
   }
   int fcntl_res = fcntl(*fd_, F_SETFD, flags);
   PERFETTO_CHECK(fcntl_res == 0);
+#else
+  ignore_result(retain);
 #endif
 }
 

test/gtest_and_gmock.h

diff --git a/test/gtest_and_gmock.h b/test/gtest_and_gmock.h
index 82918d8..710d07d 100644
--- a/test/gtest_and_gmock.h
+++ b/test/gtest_and_gmock.h
@@ -27,14 +27,14 @@
 
 #include "perfetto/base/build_config.h"
 
-#if defined(__GNUC__)  // GCC & clang
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wundef"
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif  // __GNUC__
+#endif  // defined(__GNUC__) || defined(__clang__)
 
 #if defined(__clang__)
 #pragma GCC diagnostic ignored "-Wshift-sign-overflow"
@@ -44,12 +44,12 @@
 #pragma GCC diagnostic ignored "-Wcomma"
 #endif  // PERFETTO_OS_NACL
 
-#endif
+#endif  // defined(__clang__)
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif