[cctz] update to 2.4 (#37659)

This commit is contained in:
Jia Yue Hua 2024-03-26 06:34:46 +08:00 committed by GitHub
parent ecea73ebbe
commit ccc7f46539
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 26 deletions

View File

@ -1,18 +0,0 @@
diff --git a/include/cctz/civil_time_detail.h b/include/cctz/civil_time_detail.h
index decc5f2..26c5aef 100644
--- a/include/cctz/civil_time_detail.h
+++ b/include/cctz/civil_time_detail.h
@@ -353,11 +353,11 @@ class civil_time {
: civil_time(ct.f_) {}
// Factories for the maximum/minimum representable civil_time.
- static CONSTEXPR_F civil_time (max)() {
+ static CONSTEXPR_F auto (max)() -> civil_time {
const auto max_year = (std::numeric_limits<std::int_least64_t>::max)();
return civil_time(max_year, 12, 31, 23, 59, 59);
}
- static CONSTEXPR_F civil_time (min)() {
+ static CONSTEXPR_F auto (min)() -> civil_time {
const auto min_year = (std::numeric_limits<std::int_least64_t>::min)();
return civil_time(min_year, 1, 1, 0, 0, 0);
}

View File

@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/cctz
REF v2.3
SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff
REF "v${VERSION}"
SHA512 6d50fe5263b66f93bc3f9aee0da395352d0e95187e6a761afd1b82a461c127823fe93e06139e9d8989f24875b70de3058aab6e66639b408c7930f117e1815e5e
HEAD_REF master
PATCHES
fix_vs177.patch #https://github.com/google/cctz/pull/273
)
vcpkg_cmake_configure(

View File

@ -1,7 +1,6 @@
{
"name": "cctz",
"version": "2.3",
"port-version": 7,
"version": "2.4",
"description": "two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.",
"homepage": "https://github.com/google/cctz",
"dependencies": [

View File

@ -1505,8 +1505,8 @@
"port-version": 5
},
"cctz": {
"baseline": "2.3",
"port-version": 7
"baseline": "2.4",
"port-version": 0
},
"cdt": {
"baseline": "1.4.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd30239fce330035db98ca313f5cebaa4b76da8d",
"version": "2.4",
"port-version": 0
},
{
"git-tree": "527442456bc48c0fd960541f6489dd0ac2add02c",
"version": "2.3",