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

ci: Rename macro to avoid conflict during CI unity builds #4092

Merged
merged 1 commit into from
Dec 24, 2023
Merged
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
6 changes: 3 additions & 3 deletions src/oiiotool/printinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ dump_flat_data(std::ostream& out, ImageInput* input,


// Macro to call a type-specialzed version func<type>(R,...)
#define OIIO_DISPATCH_TYPES(ret, name, func, type, R, ...) \
#define PRINTINFO_DISPATCH_TYPES(ret, name, func, type, R, ...) \
switch (type.basetype) { \
case TypeDesc::FLOAT: ret = func<float>(R, __VA_ARGS__); break; \
case TypeDesc::UINT8: ret = func<unsigned char>(R, __VA_ARGS__); break; \
Expand Down Expand Up @@ -211,8 +211,8 @@ dump_data(std::ostream& out, ImageInput* input,

} else {
OIIO_UNUSED_OK bool ok = true;
OIIO_DISPATCH_TYPES(ok, "dump_flat_data", dump_flat_data, spec.format,
out, input, opt, subimage);
PRINTINFO_DISPATCH_TYPES(ok, "dump_flat_data", dump_flat_data,
spec.format, out, input, opt, subimage);
}
}

Expand Down
Loading