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

FFS upstream master-branch #3815

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Conversation

eisenhauer
Copy link
Member

No description provided.

ffs Upstream and others added 2 commits September 19, 2023 14:58
Code extracted from:

    https://github.com/GTkorvo/ffs.git

at commit 67e411c0d7ee176a550feb3a9fb9f4e48a8d15bd (master).

Upstream Shortlog
-----------------
# By ffs Upstream
* upstream-ffs:
  ffs 2023-09-19 (67e411c0)
@anagainaru
Copy link
Contributor

Just for documentation purposes: The error we are fixing is for MacOS 14, when compiling with ffs we get the following error:

/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk/usr/include/stdlib.h:128:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk/usr/include/malloc/_malloc.h:38:
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk/usr/include/malloc/_malloc_type.h:48:82: error: expected ')'
_MALLOC_TYPE_AVAILABILITY void *malloc_type_malloc(size_t size, malloc_type_id_t type_id) __result_use_check __alloc_size(1);
                                                                                 ^
/Users/95j/work/adios/ADIOS2-main/ADIOS2-clean/build/thirdparty/ffs/ffs/cod.tab.c:234:17: note: expanded from macro 'type_id'
#define type_id 338

Copy link
Contributor

@anagainaru anagainaru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests pass

@eisenhauer eisenhauer merged commit 1487ad8 into ornladios:master Sep 19, 2023
30 checks passed
@eisenhauer eisenhauer deleted the FFSUpstreamMaster branch September 19, 2023 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants