Skip to content

Add macros for anonymous union support #293

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
bashbaug merged 1 commit into from
Oct 14, 2025
Merged

Add macros for anonymous union support #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions CL/cl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ typedef struct _cl_image_desc {
size_t image_slice_pitch;
cl_uint num_mip_levels;
cl_uint num_samples;
#if defined(CL_VERSION_2_0) && __CL_HAS_ANON_STRUCT__
__CL_ANON_STRUCT__ union {
#if defined(CL_VERSION_2_0) && __CL_HAS_ANON_UNION__
__CL_ANON_UNION__ union {
#endif
cl_mem buffer;
#if defined(CL_VERSION_2_0) && __CL_HAS_ANON_STRUCT__
#if defined(CL_VERSION_2_0) && __CL_HAS_ANON_UNION__
cl_mem mem_object;
};
#endif
Expand Down
12 changes: 6 additions & 6 deletions CL/cl_icd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ extern "C" {

typedef struct _cl_icd_dispatch {
/* OpenCL 1.0 */
#if __CL_HAS_ANON_STRUCT__
__CL_ANON_STRUCT__ union {
#if __CL_HAS_ANON_UNION__
__CL_ANON_UNION__ union {
#endif
clGetPlatformIDs_t *clGetPlatformIDs;
#if __CL_HAS_ANON_STRUCT__
#if __CL_HAS_ANON_UNION__
/* Set to CL_ICD2_TAG_KHR for cl_khr_icd 2.0.0 */
intptr_t clGetPlatformIDs_icd2_tag;
};
Expand Down Expand Up @@ -83,11 +83,11 @@ typedef struct _cl_icd_dispatch {
clRetainProgram_t *clRetainProgram;
clReleaseProgram_t *clReleaseProgram;
clBuildProgram_t *clBuildProgram;
#if __CL_HAS_ANON_STRUCT__
__CL_ANON_STRUCT__ union {
#if __CL_HAS_ANON_UNION__
__CL_ANON_UNION__ union {
#endif
clUnloadCompiler_t *clUnloadCompiler;
#if __CL_HAS_ANON_STRUCT__
#if __CL_HAS_ANON_UNION__
/* Set to CL_ICD2_TAG_KHR for cl_khr_icd 2.0.0 */
intptr_t clUnloadCompiler_icd2_tag;
};
Expand Down
10 changes: 10 additions & 0 deletions CL/cl_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,16 @@ typedef double cl_double;
#define __CL_ANON_STRUCT__
#endif

/* Define capabilities for anonymous union members. */
#if defined(__cplusplus) && __cplusplus >= 201103L
#define __CL_HAS_ANON_UNION__ 1
#define __CL_ANON_UNION__
#else
/* Follow anonymous struct logic */
#define __CL_HAS_ANON_UNION__ __CL_HAS_ANON_STRUCT__
#define __CL_ANON_UNION__ __CL_ANON_STRUCT__
#endif

#if defined(_WIN32) && defined(_MSC_VER) && __CL_HAS_ANON_STRUCT__
/* Disable warning C4201: nonstandard extension used : nameless struct/union */
#pragma warning( push )
Expand Down