diff options
Diffstat (limited to 'sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch')
-rw-r--r-- | sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch b/sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch deleted file mode 100644 index a7c41231f4b1..000000000000 --- a/sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch +++ /dev/null @@ -1,75 +0,0 @@ -Based on patch from Zoltán Fridrich <zfridric@redhat.com> -Reworked by Vyacheslav Perestoronin <perestoronin@gmail.com> -Little fixes by Vadim Misbakh-Soloviov <mva@gentoo.org> - ---- a/IO/MotionFX/vtkMotionFXCFGGrammar.h -+++ b/IO/MotionFX/vtkMotionFXCFGGrammar.h -@@ -23,7 +23,12 @@ - - // for debugging - // clang-format off -+#if TAO_PEGTL_VERSION_MAJOR >= 3 -+#include VTK_PEGTL(pegtl/contrib/trace.hpp) -+#else - #include VTK_PEGTL(pegtl/contrib/tracer.hpp) -+#endif -+ - // clang-format on - - namespace MotionFX ---- a/IO/MotionFX/vtkMotionFXCFGReader.cxx -+++ b/IO/MotionFX/vtkMotionFXCFGReader.cxx -@@ -1014,14 +1014,24 @@ - if (this->isOrientation) - { - std::vector<double> numbers; -+#if TAO_PEGTL_VERSION_MAJOR >= 3 -+ tao::pegtl::complete_trace<MotionFX::OrientationsPositionFile::Grammar, -+ Actions::PositionFile::action>(in, numbers, this->positions); -+#else - tao::pegtl::parse<MotionFX::OrientationsPositionFile::Grammar, - Actions::PositionFile::action /*, tao::pegtl::tracer*/>(in, numbers, this->positions); -+#endif - } - else - { - std::vector<double> numbers; -+#if TAO_PEGTL_VERSION_MAJOR >= 3 -+ tao::pegtl::complete_trace<MotionFX::LegacyPositionFile::Grammar, -+ Actions::PositionFile::action>(in, numbers, this->positions); -+#else - tao::pegtl::parse<MotionFX::LegacyPositionFile::Grammar, - Actions::PositionFile::action /*, tao::pegtl::tracer*/>(in, numbers, this->positions); -+#endif - } - return true; - } -- catch (const tao::pegtl::input_error& e) -+ catch (const std::filesystem::filesystem_error& e) - { - vtkGenericWarningMacro("PositionFileMotion::read_position_file failed: " << e.what()); - } -@@ -1050,7 +1060,11 @@ - { - tao::pegtl::read_input<> in(filename); - Actions::CFG::ActiveState state(this->Motions); -+#if TAO_PEGTL_VERSION_MAJOR >= 3 -+ tao::pegtl::complete_trace<MotionFX::CFG::Grammar, Actions::CFG::action>(in, state); -+#else - tao::pegtl::parse<MotionFX::CFG::Grammar, Actions::CFG::action>(in, state); -+#endif - if (this->Motions.size() == 0) - { - vtkGenericWarningMacro( -@@ -1061,7 +1075,11 @@ - if (getenv("MOTIONFX_DEBUG_GRAMMAR") != nullptr) - { - tao::pegtl::read_input<> in2(filename); -+#if TAO_PEGTL_VERSION_MAJOR >= 3 -+ tao::pegtl::complete_trace<MotionFX::CFG::Grammar, tao::pegtl::nothing>(in2); -+#else - tao::pegtl::parse<MotionFX::CFG::Grammar, tao::pegtl::nothing, tao::pegtl::tracer>(in2); -+#endif - } - return false; - } |