From 8d80efe6c515c42e58b3146dcadba74d71460258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Wed, 25 May 2016 11:35:37 +0200 Subject: [PATCH] Fixed small errors in C++-part --- examples/04_cpp17.cpp | 2 +- tex/wtfunctional.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/04_cpp17.cpp b/examples/04_cpp17.cpp index 8852249..4c57a1b 100644 --- a/examples/04_cpp17.cpp +++ b/examples/04_cpp17.cpp @@ -5,7 +5,7 @@ // $CC -Wall -Werror -pedantic -pedantic-errors -std=c++1z -o $OUT $IN /* "Old" code: - * The usage of auto to implicitly get the return type is C++17, + * The usage of auto to implicitly get the return type is C++14, * the main part is using C++11 variadic templates and overloading */ auto sum1() { return 0;} diff --git a/tex/wtfunctional.tex b/tex/wtfunctional.tex index 621b338..ad00e2b 100644 --- a/tex/wtfunctional.tex +++ b/tex/wtfunctional.tex @@ -479,7 +479,7 @@ int c = accumulate(a.begin(), a.end(), 15, minus()); \begin{frame}[fragile]{Generics example: Folds} \begin{uncoverenv}<+-> - Using \cpp{}11 with variadic templates, one has (mod \cppcmd{auto}) + Using \cpp{}11/14 with variadic templates, one has \begin{cppcode} auto sum() { return 0; }