From d293d5d72d6b6ef0ce2abe8ae22b0776020f440b Mon Sep 17 00:00:00 2001 From: Lionel Henry Date: Sun, 10 Sep 2023 08:52:55 +0200 Subject: [PATCH] Revert "Use C++14" and "Remove CXX11 specification" This reverts commit de6b6877ee494409864fa9fc8c0d7f73ba5727f4. This reverts commit 41773cbd1dfdf1315123007502eac24659d396e5. --- DESCRIPTION | 2 +- src/Makevars | 2 +- src/Makevars.ucrt | 2 +- src/Makevars.win | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 45f019a..c32ced0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -43,5 +43,5 @@ RoxygenNote: 7.1.2 Roxygen: list(markdown = TRUE) URL: https://vdiffr.r-lib.org/, https://github.com/r-lib/vdiffr BugReports: https://github.com/r-lib/vdiffr/issues -SystemRequirements: C++14, libpng +SystemRequirements: C++11, libpng Config/Needs/website: tidyverse/tidytemplate diff --git a/src/Makevars b/src/Makevars index ecdec04..34d0220 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,3 +1,3 @@ -CXX_STD = CXX14 +CXX_STD = CXX11 PKG_LIBS = -lpng -lz diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt index 9b20049..52910e3 100644 --- a/src/Makevars.ucrt +++ b/src/Makevars.ucrt @@ -1,4 +1,4 @@ -CXX_STD = CXX14 +CXX_STD = CXX11 CRT = -ucrt include Makevars.win diff --git a/src/Makevars.win b/src/Makevars.win index fa425d4..4cff4b0 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,4 +1,4 @@ -CXX_STD = CXX14 +CXX_STD = CXX11 VERSION = 2.7.4 RWINLIB = ../windows/harfbuzz-${VERSION}