-
Notifications
You must be signed in to change notification settings - Fork 7.1k
[glaze] update to 5.6.1 #46995
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.
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
Merged
[glaze] update to 5.6.1 #46995
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b536a86
[glaze] update to 5.6.0
toge 82e6a82
delete debug headers
toge ed9fc16
support win64 on interop feature
toge b0e8bb5
set VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY
toge 7d75844
update to 5.6.1
toge 7b52d24
update ci scripts
toge 42c0ff8
use feature-fails
toge 6f39198
support x86-windows
toge 5ed262d
support android-arm-android
toge 7253a56
remove interop feature
toge 8aa6ccc
remove glaze[interop]
toge File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
|
||
diff --git a/include/glaze/interop/interop.hpp b/include/glaze/interop/interop.hpp | ||
index b6ef0c2..ebee37c 100644 | ||
--- a/include/glaze/interop/interop.hpp | ||
+++ b/include/glaze/interop/interop.hpp | ||
@@ -127,7 +127,7 @@ static_assert(sizeof(glz_string_desc) == 8, "glz_string_desc must be 8 bytes"); | ||
static_assert(sizeof(glz_complex_desc) == 8, "glz_complex_desc must be 8 bytes"); | ||
|
||
// Pointer sizes vary between 32-bit and 64-bit systems | ||
-#ifdef __LP64__ | ||
+#if defined(__LP64__) || defined(_WIN64) | ||
// 64-bit system | ||
static_assert(sizeof(glz_vector_desc) == 8, "glz_vector_desc must be 8 bytes on 64-bit"); | ||
static_assert(sizeof(glz_map_desc) == 16, "glz_map_desc must be 16 bytes on 64-bit"); | ||
@@ -144,7 +144,7 @@ static_assert(sizeof(glz_struct_desc) == 12, "glz_struct_desc must be 12 bytes o | ||
static_assert(sizeof(glz_optional_desc) == 4, "glz_optional_desc must be 4 bytes on 32-bit"); | ||
static_assert(sizeof(glz_function_desc) == 20, "glz_function_desc must be 20 bytes on 32-bit"); | ||
static_assert(sizeof(glz_shared_future_desc) == 4, "glz_shared_future_desc must be 4 bytes on 32-bit"); | ||
-static_assert(sizeof(glz_variant_desc) == 20, "glz_variant_desc must be 20 bytes on 32-bit"); | ||
+static_assert(sizeof(glz_variant_desc) == 24, "glz_variant_desc must be 24 bytes on 32-bit"); | ||
#endif | ||
|
||
// The variant-like type descriptor - properly aligned | ||
@@ -167,10 +167,10 @@ struct glz_type_descriptor | ||
}; | ||
|
||
// Verify the overall type descriptor size | ||
-#ifdef __LP64__ | ||
+#if defined(__LP64__) || defined(_WIN64) | ||
static_assert(sizeof(glz_type_descriptor) == 40, "glz_type_descriptor must be 40 bytes on 64-bit"); | ||
#else | ||
-static_assert(sizeof(glz_type_descriptor) == 28, "glz_type_descriptor must be 28 bytes on 32-bit"); | ||
+static_assert(sizeof(glz_type_descriptor) == 32, "glz_type_descriptor must be 32 bytes on 32-bit"); | ||
#endif | ||
|
||
namespace glz | ||
@@ -1311,7 +1311,7 @@ struct glz_unordered_map | ||
}; | ||
|
||
// Static assertions for the C structs | ||
-#ifdef __LP64__ | ||
+#if defined(__LP64__) || defined(_WIN64) | ||
// 64-bit system | ||
static_assert(sizeof(glz_member_info) == 48, "glz_member_info must be 48 bytes on 64-bit"); | ||
static_assert(sizeof(glz_type_info) == 32, "glz_type_info must be 32 bytes on 64-bit"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -137,6 +137,8 @@ geotrans = skip # Port geotrans source ftp://ftp.nga.mil server extremely slow m | |||||
getopt:arm-uwp=fail | ||||||
getopt:x64-uwp=fail | ||||||
gflags(uwp)=fail | ||||||
# glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. | ||||||
glaze[interop]:x64-linux=feature-fails | ||||||
|
# glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. | |
glaze[interop]:x64-linux=feature-fails |
Not necessary now that the interop
feature has been removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vicroms
Thank you a lot!
I forget it.
Fixed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't merge this with that policy turned on. Can you remove adding that feature? I assume it was not added originally for this exact reason.