Ver a proveniência

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>
kris/onging/CECPQ3_patch15
Daniel Hirche há 6 anos
committed by CQ bot account: commit-bot@chromium.org
ascendente
cometimento
e6737a8656
1 ficheiros alterados com 3 adições e 3 eliminações
  1. +3
    -3
      crypto/x509/x509_test.cc

+ 3
- 3
crypto/x509/x509_test.cc Ver ficheiro

@@ -710,7 +710,7 @@ TEST(X509Test, ZeroLengthsWithX509PARAM) {

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 @@ TEST(X509Test, ZeroLengthsWithX509PARAM) {
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 @@ TEST(X509Test, ZeroLengthsWithX509PARAM) {

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,


Carregando…
Cancelar
Guardar