Skip to content
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

Update MacOS build to use GCC 14 #353

Merged
merged 2 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
compiler: { cc: 'gcc', cxx: 'g++' }
- image: 'macos-latest'
toolchain: gcc
compiler: { cc: 'gcc-11', cxx: 'g++-11' }
compiler: { cc: 'gcc-14', cxx: 'g++-14' }
runs-on: ${{ matrix.image }}
env:
CC: ${{ matrix.compiler.cc }}
Expand Down
2 changes: 1 addition & 1 deletion ionc/ion_allocation.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ iERR _ion_strdup(hOWNER owner, iSTRING dst, iSTRING src)
dst->value = (BYTE *)ion_alloc_with_owner(owner, (is_empty) ? 1 : src->length);
if (!dst->value) FAILWITH(IERR_NO_MEMORY);
}
memcpy(dst->value, (is_empty) ? "\0" : src->value, (is_empty) ? 1 : src->length);
memcpy(dst->value, (is_empty) ? (BYTE*)"\0" : src->value, (is_empty) ? 1 : src->length);

dst->length = src->length;

Expand Down
2 changes: 1 addition & 1 deletion ionc/ion_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ GLOBAL BOOL _debug_on INITTO(TRUE);
(xb) = (*(xh)->_curr++); \
} \
else { \
IONCHECK(ion_stream_read_byte((xh), &(xb))); \
IONCHECK(ion_stream_read_byte((xh), (int *)&(xb))); \
} while(FALSE)

// macro for read_byte
Expand Down
Loading