Skip to content

[scnlib] support fast-float 7.0.0 #43471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Victor Romero (vicroms) merged 3 commits into from
Jan 27, 2025
Merged

[scnlib] support fast-float 7.0.0 #43471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef694a
[scnlib] support fast-float 7.0.0
toge Jan 25, 2025
5182fe6
update port-version
toge Jan 26, 2025
406dbc0
restore port-version 0
toge Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ports/scnlib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 db14d71da3c1ecb849f00ac1e334f39c532592230e950aa1009ff00ba56670cb71e33ca457fd4ac66595ff43f0dca0e42d45f672848b9cde3cba80f19ef8693f
HEAD_REF master
PATCHES
# support fast_float 7.0.0
scnlib-pr-136.patch
)

vcpkg_cmake_configure(
Expand Down
26 changes: 26 additions & 0 deletions ports/scnlib/scnlib-pr-136.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/src/scn/impl.cpp b/src/scn/impl.cpp
index aa0d334..ab859a4 100644
--- a/src/scn/impl.cpp
+++ b/src/scn/impl.cpp
@@ -721,15 +721,17 @@ scan_expected<std::ptrdiff_t> fast_float_fallback(impl_init_data<CharT> data,
struct fast_float_impl_base : impl_base {
fast_float::chars_format get_flags() const
{
- unsigned format_flags{};
+ fast_float::chars_format format_flags{};
if ((m_options & float_reader_base::allow_fixed) != 0) {
- format_flags |= fast_float::fixed;
+ format_flags =
+ static_cast<fast_float::chars_format>(format_flags | fast_float::chars_format::fixed);
}
if ((m_options & float_reader_base::allow_scientific) != 0) {
- format_flags |= fast_float::scientific;
+ format_flags =
+ static_cast<fast_float::chars_format>(format_flags | fast_float::chars_format::scientific);
}

- return static_cast<fast_float::chars_format>(format_flags);
+ return format_flags;
}
};

1 change: 1 addition & 0 deletions ports/scnlib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "scnlib",
"version": "4.0.1",
"port-version": 1,
"description": "scnlib is a modern C++ library for replacing scanf and std::istream",
"homepage": "https://scnlib.dev/",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8190,7 +8190,7 @@
},
"scnlib": {
"baseline": "4.0.1",
"port-version": 0
"port-version": 1
},
"scope-guard": {
"baseline": "1.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/scnlib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b26c97d1ad11fc4a361f470db0f66b9afccd218c",
"version": "4.0.1",
"port-version": 1
},
{
"git-tree": "c4f32fa5eff83c4abe03aa721dcc57c3fd3f0a02",
"version": "4.0.1",
Expand Down