Преглед на файлове

Fix build with VS 2017.

Lots more warnings to disable...

Change-Id: Ic240dd74d9abab8fe6d696c15267138b857d0dc1
Reviewed-on: https://boringssl-review.googlesource.com/16745
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
kris/onging/CECPQ3_patch15
David Benjamin преди 7 години
committed by CQ bot account: commit-bot@chromium.org
родител
ревизия
8ba6a1496b
променени са 4 файла, в които са добавени 8 реда и са изтрити 3 реда
  1. +2
    -0
      CMakeLists.txt
  2. +2
    -2
      ssl/test/bssl_shim.cc
  3. +1
    -0
      third_party/googletest/METADATA
  4. +3
    -1
      third_party/googletest/include/gtest/gtest.h

+ 2
- 0
CMakeLists.txt Целия файл

@@ -89,9 +89,11 @@ elseif(MSVC)
"C4706" # assignment within conditional expression
"C4710" # 'function': function not inlined
"C4711" # function 'function' selected for inline expansion
"C4774" # format string is not a string literal
"C4800" # 'int' : forcing value to bool 'true' or 'false'
# (performance warning)
"C4820" # 'bytes' bytes padding added after construct 'member_name'
"C4987" # nonstandard extension used: 'throw (...)'
"C5026" # move constructor was implicitly defined as deleted
"C5027" # move assignment operator was implicitly defined as deleted
)


+ 2
- 2
ssl/test/bssl_shim.cc Целия файл

@@ -447,8 +447,8 @@ static bool GetCertificate(SSL *ssl, bssl::UniquePtr<X509> *out_x509,
const TestConfig *config = GetTestConfig(ssl);

if (!config->digest_prefs.empty()) {
std::unique_ptr<char, Free<char>> digest_prefs(
strdup(config->digest_prefs.c_str()));
bssl::UniquePtr<char> digest_prefs(
OPENSSL_strdup(config->digest_prefs.c_str()));
std::vector<int> digest_list;

for (;;) {


+ 1
- 0
third_party/googletest/METADATA Целия файл

@@ -15,4 +15,5 @@ third_party {
"https://github.com/google/googletest/pull/965 was applied."
"https://github.com/google/googletest/pull/991 was applied."
"https://github.com/google/googletest/pull/1007 was applied."
"https://github.com/google/googletest/pull/1109 was applied."
}

+ 3
- 1
third_party/googletest/include/gtest/gtest.h Целия файл

@@ -259,7 +259,9 @@ class GTEST_API_ AssertionResult {
// Used in EXPECT_TRUE/FALSE(assertion_result).
AssertionResult(const AssertionResult& other);

GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
GTEST_DISABLE_MSC_WARNINGS_PUSH_(
4619 /* unknown warning (warning 4800 is removed in MSVC 2017) */
4800 /* forcing value to bool */)

// Used in the EXPECT_TRUE/FALSE(bool_expression).
//


Зареждане…
Отказ
Запис