From 29ee0ac43f604f68d50d8538272717c7de0af10e Mon Sep 17 00:00:00 2001
From: Sebastien Ponce <sebastien.ponce@cern.ch>
Date: Fri, 13 Oct 2023 17:48:58 +0200
Subject: [PATCH 1/2] Fixes in tables of godbolt and good practice links

---
 talk/expert/coroutines.tex              | 2 +-
 talk/morelanguage/raii.tex              | 4 ++--
 talk/objectorientation/advancedoo.tex   | 5 ++---
 talk/objectorientation/constructors.tex | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/talk/expert/coroutines.tex b/talk/expert/coroutines.tex
index 0146a6d0..c1c654b9 100644
--- a/talk/expert/coroutines.tex
+++ b/talk/expert/coroutines.tex
@@ -234,7 +234,7 @@ \subsection{Coroutines}
 \begin{frame}[fragile]
   \frametitlecpp[20]{Resuming a coroutine}
   \scriptsize
-  \begin{exampleblockGB}{User code}{https://godbolt.org/z/qx46Pa4v3}{Resuming a coroutine}
+  \begin{exampleblockGB}{User code}{https://godbolt.org/z/qx46Pa4v3}{Coroutine resume}
     \begin{cppcode*}{gobble=2}
       Task myCoroutine() {
         std::cout << "Step 1 of coroutine\n";
diff --git a/talk/morelanguage/raii.tex b/talk/morelanguage/raii.tex
index 3f0d358e..55d7654d 100644
--- a/talk/morelanguage/raii.tex
+++ b/talk/morelanguage/raii.tex
@@ -335,7 +335,7 @@
 
 \begin{frame}[fragile]
   \frametitlecpp[11]{Quiz: \texttt{std::shared\_ptr} in use}
-  \begin{exampleblockGB}{What is the output of this code?}{https://godbolt.org/z/vM35Y6qEW}{\texttt{std::shared\_ptr} quiz}
+  \begin{exampleblockGB}{What is the output of this code?}{https://godbolt.org/z/vM35Y6qEW}{\texttt{shared\_ptr} quiz}
     \small
     \begin{cppcode*}{gobble=2}
       auto shared = std::make_shared<int>(100);
@@ -397,7 +397,7 @@
 
 \begin{frame}[fragile]
   \frametitlecpp[11]{Quiz: \texttt{shared\_ptr} and \texttt{weak\_ptr} in use}
-  \begin{exampleblockGB}{What is the output of this code?}{https://godbolt.org}{\texttt{shared\_ptr} vs.\ \texttt{weak\_ptr} quiz}
+  \begin{exampleblockGB}{What is the output of this code?}{https://godbolt.org}{\texttt{shared/weak\_ptr}}
     \small
     \begin{cppcode*}{gobble=2}
       auto shared = std::make_shared<int>(100);
diff --git a/talk/objectorientation/advancedoo.tex b/talk/objectorientation/advancedoo.tex
index 149caeaf..621d455b 100644
--- a/talk/objectorientation/advancedoo.tex
+++ b/talk/objectorientation/advancedoo.tex
@@ -536,13 +536,12 @@
     \item And for rare special cases
     \end{itemize}
   \end{goodpractice}
-  \pause
-  \begin{goodpractice}{Absolutely avoid diamond-shaped inheritance}
+  \begin{goodpracticeWithShortcut}{Absolutely avoid diamond-shaped inheritance}{NO diamond inheritance}
     \begin{itemize}
     \item This is a sign that your architecture is not correct
     \item In case you are tempted, think twice and change your mind
     \end{itemize}
-  \end{goodpractice}
+  \end{goodpracticeWithShortcut}
 \end{frame}
 
 \begin{frame}[fragile]
diff --git a/talk/objectorientation/constructors.tex b/talk/objectorientation/constructors.tex
index 6edcc0ad..fb2fbf6e 100644
--- a/talk/objectorientation/constructors.tex
+++ b/talk/objectorientation/constructors.tex
@@ -133,7 +133,7 @@
     \item A constructor with a single non-default parameter can be used by the compiler for an implicit conversion.
     \end{itemize}
   \end{block}
-  \begin{exampleblockGB}{Example}{https://godbolt.org/z/TvqT185fz}{Unary constructor in action}
+  \begin{exampleblockGB}{Example}{https://godbolt.org/z/TvqT185fz}{Unary constructor}
     \begin{cppcode}
     void print(const Vector & v) {
       std::cout << "printing v elements...\n";

From 21887cf950c48fafc5dd7ffc54021b4f7585adcf Mon Sep 17 00:00:00 2001
From: Sebastien Ponce <sebastien.ponce_github@m4x.org>
Date: Fri, 13 Oct 2023 18:37:02 +0200
Subject: [PATCH 2/2] fixed typo

Co-authored-by: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
---
 talk/expert/coroutines.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/talk/expert/coroutines.tex b/talk/expert/coroutines.tex
index c1c654b9..23004099 100644
--- a/talk/expert/coroutines.tex
+++ b/talk/expert/coroutines.tex
@@ -234,7 +234,7 @@ \subsection{Coroutines}
 \begin{frame}[fragile]
   \frametitlecpp[20]{Resuming a coroutine}
   \scriptsize
-  \begin{exampleblockGB}{User code}{https://godbolt.org/z/qx46Pa4v3}{Coroutine resume}
+  \begin{exampleblockGB}{User code}{https://godbolt.org/z/qx46Pa4v3}{Coroutine resumption}
     \begin{cppcode*}{gobble=2}
       Task myCoroutine() {
         std::cout << "Step 1 of coroutine\n";