diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c5970cd..61c5d4bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ endfunction() find_package(Threads MODULE REQUIRED) -find_package(pegtl 3.1.0 QUIET CONFIG) +find_package(pegtl 3.2.0 QUIET CONFIG) if(NOT pegtl_FOUND) # If a compatible version of PEGTL is not already installed, build and install it from the submodule directory. set(PEGTL_BUILD_TESTS OFF CACHE BOOL "Disable PEGTL tests") diff --git a/PEGTL b/PEGTL index c3e1ab52..7d039707 160000 --- a/PEGTL +++ b/PEGTL @@ -1 +1 @@ -Subproject commit c3e1ab5295a30c15da04b2e289fcfea82d37bce8 +Subproject commit 7d039707cf835cea63daa78a717e18fcc5bcf95b diff --git a/README.md b/README.md index 05582c38..7482599c 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,9 @@ means you need to include an acknowledgement along with the license text. ### graphqlpeg -- GraphQL parsing: [Parsing Expression Grammar Template Library (PEGTL)](https://github.com/taocpp/PEGTL) release 3.1.1, +- GraphQL parsing: [Parsing Expression Grammar Template Library (PEGTL)](https://github.com/taocpp/PEGTL) release 3.2.0, which is part of [The Art of C++](https://taocpp.github.io/) library collection. I've added this as a sub-module, so you -do not need to install this separately. If you already have 3.1.1 installed where CMake can find it, it will use that +do not need to install this separately. If you already have 3.2.0 installed where CMake can find it, it will use that instead of the sub-module and avoid installing another copy of PEGTL. ### graphqlservice diff --git a/include/graphqlservice/GraphQLTree.h b/include/graphqlservice/GraphQLTree.h index 73d8e2e7..d2607f37 100644 --- a/include/graphqlservice/GraphQLTree.h +++ b/include/graphqlservice/GraphQLTree.h @@ -13,19 +13,6 @@ #include #include -// Temporarily workaround the tao::demangle namespace in 3.1.0. This was fixed in PEGTL commit -// https://github.com/taocpp/PEGTL/commit/0cc3128e07734fb72e23e2eeee70b9f1fc13ca5f, which put this -// in the correct namespace defined by TAO_PEGTL_NAMESPACE (tao::graphqlpeg) and should be included -// in 3.1.1 or later. Once that version of PEGTL is released, this can be removed. -#include - -#if (TAO_PEGTL_VERSION_MAJOR == 3) && (TAO_PEGTL_VERSION_MINOR == 1) \ - && (TAO_PEGTL_VERSION_PATCH < 1) -namespace tao::graphqlpeg { -using ::tao::demangle; -} -#endif - #include #include #include