diff --git a/CMake/CTestCustom.cmake.in b/CMake/CTestCustom.cmake.in
index 0ef766e921a5911643177eb8e0232e9893b7892f..53226c57e930c36be05ac67f18e0618b505050f4 100644
--- a/CMake/CTestCustom.cmake.in
+++ b/CMake/CTestCustom.cmake.in
@@ -254,7 +254,7 @@ endif ()
if (NOT "$ENV{CI}" STREQUAL "")
# Warning exclusions for old compilers and dependencies.
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "mindeps")
- # GCC 4.8.5
+ # GCC 8.0.0
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "el7")
list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
# Deprecated classes trigger "usage" warnings in methods marked with
diff --git a/Common/Core/vtkStringToken.h b/Common/Core/vtkStringToken.h
index 630ad387e03cb01b9bcb32462573c065ba7247b6..8c39b57ecfe7eef65105bc643a836fb8f6681166 100644
--- a/Common/Core/vtkStringToken.h
+++ b/Common/Core/vtkStringToken.h
@@ -33,18 +33,6 @@
#include <cstdint> // for `std::uint*_t`
#include <unordered_set> // for membership API
-// GCC 4.8.5 requires a space between the quotes and suffix operator.
-// Whereas, C++23 deprecates the space here though.
-#ifdef VTK_COMPILER_GCC
-#if VTK_COMPILER_GCC_VERSION <= 40805
-#define VTK_STRING_TOKEN_SPACE_BEFORE_SUFFIX 1
-#else
-#define VTK_STRING_TOKEN_SPACE_BEFORE_SUFFIX 0
-#endif
-#else
-#define VTK_STRING_TOKEN_SPACE_BEFORE_SUFFIX 0
-#endif
-
VTK_ABI_NAMESPACE_BEGIN
class VTKCOMMONCORE_EXPORT vtkStringToken
@@ -193,13 +181,8 @@ VTK_ABI_NAMESPACE_BEGIN
/// occurs at build time. This is more efficient than
/// a sequence of if-conditionals performing string
/// comparisons.
-#if VTK_STRING_TOKEN_SPACE_BEFORE_SUFFIX
-constexpr VTKCOMMONCORE_EXPORT vtkStringToken::Hash operator"" _hash(
- const char* data, std::size_t size)
-#else
constexpr VTKCOMMONCORE_EXPORT vtkStringToken::Hash operator""_hash(
const char* data, std::size_t size)
-#endif
{
return vtkStringToken::StringHash(data, size);
}
@@ -213,11 +196,7 @@ constexpr VTKCOMMONCORE_EXPORT vtkStringToken::Hash operator""_hash(
/// // std::cout << t.value() << "\n"; // Prints "test" if someone else constructed the token from a
/// ctor; else throws exception.
/// ```
-#if VTK_STRING_TOKEN_SPACE_BEFORE_SUFFIX
-constexpr VTKCOMMONCORE_EXPORT vtkStringToken operator"" _token(const char* data, std::size_t size)
-#else
constexpr VTKCOMMONCORE_EXPORT vtkStringToken operator""_token(const char* data, std::size_t size)
-#endif
{
return vtkStringToken(vtkStringToken::StringHash(data, size));
}
@@ -267,5 +246,4 @@ struct VTKCOMMONCORE_EXPORT hash<vtkStringToken>
};
} // namespace std
-#undef VTK_STRING_TOKEN_SPACE_BEFORE_SUFFIX
#endif // vtkStringToken_h
diff --git a/Common/DataModel/Testing/Cxx/otherCellGrid.cxx b/Common/DataModel/Testing/Cxx/otherCellGrid.cxx
index 5a6fbdb3d89944c7cd18e62f19e19e7c510712de..55e6805c356573df3518ab315e1e7f687b388a9f 100644
--- a/Common/DataModel/Testing/Cxx/otherCellGrid.cxx
+++ b/Common/DataModel/Testing/Cxx/otherCellGrid.cxx
@@ -11,7 +11,6 @@
int otherCellGrid(int, char*[])
{
-#if !defined(VTK_COMPILER_GCC) || VTK_COMPILER_GCC_VERSION > 40805
std::string space;
double dim;
int hs = -42;
@@ -90,7 +89,6 @@ int otherCellGrid(int, char*[])
vtkLog(ERROR, "Unexpected results parsing vtkCellAttribute space.");
return EXIT_FAILURE;
}
-#endif
vtkNew<vtkCellGrid> cg;
if (cg->SupportsGhostArray(vtkDataObject::POINT) || !cg->SupportsGhostArray(vtkDataObject::CELL))
diff --git a/Filters/General/vtkTableBasedClipCases.h b/Filters/General/vtkTableBasedClipCases.h
index 34609de8979f8cd5a23d67067d088a87d556531b..4c756bd5bd3eb073aa4b72177135546f1d310732 100644
--- a/Filters/General/vtkTableBasedClipCases.h
+++ b/Filters/General/vtkTableBasedClipCases.h
@@ -116,42 +116,27 @@ protected:
{ { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N }, { N, N } },
};
-#if defined(VTK_COMPILER_GCC) && VTK_COMPILER_GCC_VERSION <= 40805
-// XXX(gcc-4.8.5)
-// GCC 4.8.5 has the following bugs
-// internal compiler error: unexpected expression 'static_cast<int16_t>(-1)' of kind static_cast_expr internal compiler error: unexpected expression '(int16_t)((-1))' of kind cast_expr
-#define VTK_CLIP_CAST(type, value) value
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnarrowing"
-#else
-#define VTK_CLIP_CAST(type, value) static_cast<type>(value)
-#endif
-
// index into StartCellCases for each cell
static constexpr int16_t CellCasesStartIndexLookUp[NUM_CELL_TYPES] = {
- VTK_CLIP_CAST(int16_t, -1), // 0 = VTK_EMPTY_CELL
- VTK_CLIP_CAST(int16_t, 0), // 1 = VTK_VERTEX
- VTK_CLIP_CAST(int16_t, -1), // 2 = VTK_POLY_VERTEX
- VTK_CLIP_CAST(int16_t, 2), // 3 = VTK_LINE
- VTK_CLIP_CAST(int16_t, -1), // 4 = VTK_POLY_LINE
- VTK_CLIP_CAST(int16_t, 6), // 5 = VTK_TRIANGLE
- VTK_CLIP_CAST(int16_t, -1), // 6 = VTK_TRIANGLE_STRIP
- VTK_CLIP_CAST(int16_t, -1), // 7 = VTK_POLYGON
- VTK_CLIP_CAST(int16_t, 14), // 8 = VTK_PIXEL
- VTK_CLIP_CAST(int16_t, 30), // 9 = VTK_QUAD
- VTK_CLIP_CAST(int16_t, 46), // 10 = VTK_TETRA
- VTK_CLIP_CAST(int16_t, 62), // 11 = VTK_VOXEL
- VTK_CLIP_CAST(int16_t, 318), // 12 = VTK_HEXAHEDRON
- VTK_CLIP_CAST(int16_t, 574), // 13 = VTK_WEDGE
- VTK_CLIP_CAST(int16_t, 638), // 14 = VTK_PYRAMID
- VTK_CLIP_CAST(int16_t, -1), // 15 = VTK_PENTAGONAL_PRISM
- VTK_CLIP_CAST(int16_t, -1), // 16 = VTK_HEXAGONAL_PRISM
+ static_cast<int16_t>(-1), // 0 = VTK_EMPTY_CELL
+ static_cast<int16_t>(0), // 1 = VTK_VERTEX
+ static_cast<int16_t>(-1), // 2 = VTK_POLY_VERTEX
+ static_cast<int16_t>(2), // 3 = VTK_LINE
+ static_cast<int16_t>(-1), // 4 = VTK_POLY_LINE
+ static_cast<int16_t>(6), // 5 = VTK_TRIANGLE
+ static_cast<int16_t>(-1), // 6 = VTK_TRIANGLE_STRIP
+ static_cast<int16_t>(-1), // 7 = VTK_POLYGON
+ static_cast<int16_t>(14), // 8 = VTK_PIXEL
+ static_cast<int16_t>(30), // 9 = VTK_QUAD
+ static_cast<int16_t>(46), // 10 = VTK_TETRA
+ static_cast<int16_t>(62), // 11 = VTK_VOXEL
+ static_cast<int16_t>(318), // 12 = VTK_HEXAHEDRON
+ static_cast<int16_t>(574), // 13 = VTK_WEDGE
+ static_cast<int16_t>(638), // 14 = VTK_PYRAMID
+ static_cast<int16_t>(-1), // 15 = VTK_PENTAGONAL_PRISM
+ static_cast<int16_t>(-1), // 16 = VTK_HEXAGONAL_PRISM
};
-#if defined(VTK_COMPILER_GCC) && VTK_COMPILER_GCC_VERSION <= 40805
-#pragma GCC diagnostic pop
-#endif
-
public:
/**
* Given a cell type return if it's supported by this class.