commit e6737a86568dd3da416aa94d9346b49e24e016f3
author Daniel Hirche <daniel@xcx.cc> Tue May 15 14:08:24 2018 +0200
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue May 15 22:58:22 2018 +0000
tree 4f620b9d5a4070778176c44d4cdd9e8a8ad0d0df
parent 911cc0a0aa66b8d51defd4e9875075f895a07649

x509_test: Fix gcc-8 build

gcc-8 complains that struct Test shadows class Test from googletest.

Change-Id: Ie0c61eecebc726973c6aaa949e338da3d4474977
Reviewed-on: https://boringssl-review.googlesource.com/28524
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/x509/x509_test.cc

diff --git a/crypto/x509/x509_test.cc b/crypto/x509/x509_test.cc
index 9c99aee..b118215 100644
--- a/crypto/x509/x509_test.cc
+++ b/crypto/x509/x509_test.cc
@@ -710,7 +710,7 @@
 
   std::vector<X509_CRL *> empty_crls;
 
-  struct Test {
+  struct X509Test {
     const char *correct_value;
     size_t correct_value_len;
     const char *incorrect_value;
@@ -718,7 +718,7 @@
     int (*func)(X509_VERIFY_PARAM *, const char *, size_t);
     int mismatch_error;
   };
-  const std::vector<Test> kTests = {
+  const std::vector<X509Test> kTests = {
       {kHostname, strlen(kHostname), kWrongHostname, strlen(kWrongHostname),
        X509_VERIFY_PARAM_set1_host, X509_V_ERR_HOSTNAME_MISMATCH},
       {kEmail, strlen(kEmail), kWrongEmail, strlen(kWrongEmail),
@@ -727,7 +727,7 @@
 
   for (size_t i = 0; i < kTests.size(); i++) {
     SCOPED_TRACE(i);
-    const Test &test = kTests[i];
+    const X509Test &test = kTests[i];
 
     // The correct value should work.
     ASSERT_EQ(X509_V_OK,