[fmt] Fix an easily avoidable compilation warning (#18622)

* Fix an unconditional #pragma warning breaking other compilers.

* Increase fmt version

* re-ran vcpkg x-add-version --all --overwrite-version, this time it produced a different result for some reason
This commit is contained in:
Matt Haynie 2021-07-01 08:26:35 -07:00 committed by GitHub
parent 9e7cb8379e
commit 9a7d5a29dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions

View File

@ -2,11 +2,13 @@ diff --git a/include/fmt/format.h b/include/fmt/format.h
index 4e96539..0f1d179 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -33,6 +33,7 @@
@@ -33,6 +33,9 @@
#ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_
+#ifdef _MSC_VER
+#pragma warning(disable:4189)
+#endif
#include <algorithm>
#include <cerrno>
#include <cmath>

View File

@ -1,7 +1,7 @@
{
"name": "fmt",
"version": "7.1.3",
"port-version": 4,
"port-version": 5,
"description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
"homepage": "https://github.com/fmtlib/fmt",
"dependencies": [

View File

@ -2054,7 +2054,7 @@
},
"fmt": {
"baseline": "7.1.3",
"port-version": 4
"port-version": 5
},
"folly": {
"baseline": "2020.10.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d",
"version": "7.1.3",
"port-version": 5
},
{
"git-tree": "230e140a15afbb9089537e153d8b83f5b994adbe",
"version": "7.1.3",