Skip to content

COMP: removed workarounds for old Apple stuff #5427

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
thewtex merged 1 commit into from
Jun 20, 2025
Merged

COMP: removed workarounds for old Apple stuff #5427

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
10 changes: 0 additions & 10 deletions Modules/Core/Common/include/itkImageRegion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,13 +428,6 @@ operator<<(std::ostream & os, const ImageRegion<VImageDimension> & region);

namespace std
{
#if defined(__clang__) && defined(__apple_build_version__) && (__clang_major__ <= 10)
# pragma clang diagnostic push
// Old AppleClang 10.0.0 (Xcode 10.1, newest on macOS 10.13) produced some unimportant warnings, like:
// "warning: 'tuple_size' defined as a struct template here but previously declared as a class template"
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif

// NOLINTBEGIN(cert-dcl58-cpp)
// Locally suppressed the following warning from Clang-Tidy (LLVM 17.0.1), as it appears undeserved.
// > warning: modification of 'std' namespace can result in undefined behavior [cert-dcl58-cpp]
Expand All @@ -460,9 +453,6 @@ struct tuple_element<VTupleIndex, itk::ImageRegion<VImageDimension>>

// NOLINTEND(cert-dcl58-cpp)

#if defined(__clang__) && defined(__apple_build_version__) && (__clang_major__ <= 10)
# pragma clang diagnostic pop
#endif
} // namespace std

#undef itkRegionOverrideMacro
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/include/itkMacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,8 @@ namespace itk
// define a minimum __sgi version that will work.
# error "The SGI compiler is not supported"
#endif
#if defined(__APPLE__)
# if defined(__clang__) && (__cplusplus < 201703L)
# error "Apple LLVM compiling with a standard less than C++17 is not supported"
# endif
#if defined(__apple_build_version__) && (__apple_build_version__ < 12000032)
# error "AppleClang < Xcode 12.4 is not supported"
#elif defined(__clang__) && (__clang_major__ < 5)
# error "Clang < 5 is not supported"
#endif
Expand Down
5 changes: 0 additions & 5 deletions Modules/IO/ImageBase/src/itkImageIOBase.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,7 @@ ImageIOBase::ReadBufferAsBinary(std::istream & is, void * buffer, ImageIOBase::S

const std::streamsize numberOfBytesRead = is.gcount();

#ifdef __APPLE_CC__
// fail() is broken in the Mac. It returns true when reaches eof().
if (numberOfBytesRead != numberOfBytesToBeRead)
#else
if ((numberOfBytesRead != numberOfBytesToBeRead) || is.fail())
#endif
{
return false; // read failed
}
Expand Down
Loading