From 9b864e76e68e07c03d604e10a97f5f7a59a68f6c Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Wed, 6 Nov 2019 22:25:27 +0100
Subject: [PATCH] git subrepo pull (merge) packages/PEGTL
subrepo:
subdir: "packages/PEGTL"
merged: "ed5a3f88d"
upstream:
origin: "git@github.com:taocpp/PEGTL.git"
branch: "master"
commit: "ed5a3f88d"
git-subrepo:
version: "0.4.0"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "5d6aba9"
---
packages/PEGTL/.gitrepo | 4 ++--
packages/PEGTL/.travis.yml | 21 ++++++++++++++++++-
packages/PEGTL/README.md | 5 +++--
.../include/tao/pegtl/internal/endian.hpp | 2 +-
.../include/tao/pegtl/internal/iterator.hpp | 2 +-
packages/PEGTL/src/test/pegtl/demangle.cpp | 2 +-
6 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/packages/PEGTL/.gitrepo b/packages/PEGTL/.gitrepo
index 527ac34bc..50937092f 100644
--- a/packages/PEGTL/.gitrepo
+++ b/packages/PEGTL/.gitrepo
@@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:taocpp/PEGTL.git
branch = master
- commit = 1d7ede3134b8b4864140dc1a5be494ac570a309e
- parent = 15fe2ba73eafb183b53730d51702665841edd32f
+ commit = ed5a3f88d5ed446d8afc3556e1b6ad5757e3351e
+ parent = ef714b6fc3318ba1f5f6eea47b36a843c699680b
cmdver = 0.4.0
method = merge
diff --git a/packages/PEGTL/.travis.yml b/packages/PEGTL/.travis.yml
index b127ea3ca..180816260 100644
--- a/packages/PEGTL/.travis.yml
+++ b/packages/PEGTL/.travis.yml
@@ -87,6 +87,19 @@ matrix:
- CXX=clang++-8
- CPPFLAGS=-fno-rtti
+ - compiler: clang
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+ key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+ packages:
+ - clang-9
+ - g++-9
+ env:
+ - CXX=clang++-9
+
- os: osx
osx_image: xcode9.4
compiler: clang
@@ -94,7 +107,13 @@ matrix:
- CXX=clang++
- os: osx
- osx_image: xcode10.2
+ osx_image: xcode10.3
+ compiler: clang
+ env:
+ - CXX=clang++
+
+ - os: osx
+ osx_image: xcode11.2
compiler: clang
env:
- CXX=clang++
diff --git a/packages/PEGTL/README.md b/packages/PEGTL/README.md
index 082f66d75..7c3354e5c 100644
--- a/packages/PEGTL/README.md
+++ b/packages/PEGTL/README.md
@@ -66,12 +66,13 @@ Each commit is automatically tested with multiple architectures, operating syste
* macOS (using libc++)
* macOS 10.13, Xcode 9.4
- * macOS 10.14, Xcode 10.2
+ * macOS 10.14, Xcode 10.3
+ * macOS 10.14, Xcode 11.2
* Ubuntu 16.04 LTS (using libstdc++)
* GCC 7.x, 8.x, 9.x
- * Clang 5.x, 6.x, 7.x, 8.x
+ * Clang 5.x, 6.x, 7.x, 8.x, 9.x
Additionally, each commit is checked with Clang's [Static Analyzer](https://clang-analyzer.llvm.org/), GCC's and Clang's [sanitizers](https://github.com/google/sanitizers), [`clang-tidy`](http://clang.llvm.org/extra/clang-tidy/), and [`valgrind`](http://valgrind.org/).
Code coverage is automatically measured and the unit tests cover 100% of the core library code (for releases).
diff --git a/packages/PEGTL/include/tao/pegtl/internal/endian.hpp b/packages/PEGTL/include/tao/pegtl/internal/endian.hpp
index 733248ec8..758dec29f 100644
--- a/packages/PEGTL/include/tao/pegtl/internal/endian.hpp
+++ b/packages/PEGTL/include/tao/pegtl/internal/endian.hpp
@@ -9,7 +9,7 @@
#include "../config.hpp"
-#if defined( _WIN32 ) && !defined( __MINGW32__ )
+#if defined( _WIN32 ) && !defined( __MINGW32__ ) && !defined( __CYGWIN__ )
#include "endian_win.hpp"
#else
#include "endian_gcc.hpp"
diff --git a/packages/PEGTL/include/tao/pegtl/internal/iterator.hpp b/packages/PEGTL/include/tao/pegtl/internal/iterator.hpp
index 490a8c733..cf8f319ad 100644
--- a/packages/PEGTL/include/tao/pegtl/internal/iterator.hpp
+++ b/packages/PEGTL/include/tao/pegtl/internal/iterator.hpp
@@ -12,7 +12,7 @@ namespace TAO_PEGTL_NAMESPACE::internal
{
struct iterator
{
- iterator() noexcept = default;
+ iterator() = default;
explicit iterator( const char* in_data ) noexcept
: data( in_data )
diff --git a/packages/PEGTL/src/test/pegtl/demangle.cpp b/packages/PEGTL/src/test/pegtl/demangle.cpp
index a17e754d2..839b2287d 100644
--- a/packages/PEGTL/src/test/pegtl/demangle.cpp
+++ b/packages/PEGTL/src/test/pegtl/demangle.cpp
@@ -15,7 +15,7 @@ namespace TAO_PEGTL_NAMESPACE
void unit_test()
{
-#if defined( __GNUC__ ) && ( __GNUC__ == 9 ) || ( __GNUC_MINOR__ <= 2 )
+#if !defined( __clang__ ) && defined( __GNUC__ ) && ( __GNUC__ == 9 ) && ( __GNUC_MINOR__ <= 2 )
// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91155
test< int >( "i" );
test< double >( "d" );
--
GitLab