Tweak annotations

Author: jserv

concurrency-primer.tex

@@ -405,7 +405,7 @@ \subsection{Test and set}
 \clang{} and \cplusplus{} offer a type dedicated to this purpose, called \monobox{atomic\_flag}.
 We could use it to build a simple spinlock:
 \label{spinlock}
-\begin{cppcode}
+\begin{ccode}
 atomic_flag af = ATOMIC_FLAG_INIT;
 
 void lock()
@@ -414,7 +414,7 @@ \subsection{Test and set}
 }
 
 void unlock() { atomic_flag_clear(&af); }
-\end{cppcode}
+\end{ccode}
 If we call \cc|lock()| and the previous value is \cc|false|,
 we are the first to acquire the lock,
 and can proceed with exclusive access to whatever the lock protects.
@@ -555,7 +555,7 @@ \section{Sequential consistency on weakly-ordered hardware}
 Other systems programming languages like D and Rust have converged on similar models.}
 Let's examine \textsc{Arm}, since it is both popular and straightforward.
 Consider the simplest atomic operations: loads and stores.
-Given some \cpp|atomic_int foo|,
+Given some \cc|atomic_int foo|,
 \newline
 % Shield your eyes.
 % Essentially,
@@ -564,12 +564,12 @@ \section{Sequential consistency on weakly-ordered hardware}
 % 3. In the middle, place an arrow for each (futzing with height a bit)
 %    with the text "becomes" over it.
 \begin{minipage}{0.35\linewidth}
-\begin{cppcode}
+\begin{ccode}
 int getFoo()
 {
     return foo;
 }
-\end{cppcode}
+\end{ccode}
 \end{minipage}
 \raisebox{-1ex}{
 \begin{tikzpicture}
@@ -588,12 +588,12 @@ \section{Sequential consistency on weakly-ordered hardware}
 \end{minipage}
 %Similarly,
 \begin{minipage}{0.35\linewidth}
-\begin{cppcode}
+\begin{ccode}
 void setFoo(int i)
 {
     foo = i;
 }
-\end{cppcode}
+\end{ccode}
 \end{minipage}
 \raisebox{-1ex}{
 \begin{tikzpicture}
@@ -631,9 +631,9 @@ \section{Implementing atomic read-modify-write operations with LL/SC instruction
 This mechanism is illustrated through an atomic fetch and add example.
 
 On \textsc{Arm},
-\begin{cppcode}
+\begin{ccode}
 void incFoo() { ++foo; }
-\end{cppcode}
+\end{ccode}
 compiles to:
 \begin{lstlisting}[language={[ARM]Assembler}]
 incFoo:
@@ -759,9 +759,7 @@ \section{Memory orderings}
 \begin{cppcode}
 void lock()
 {
-    while (af.test_and_set(memory_order_acquire)) {
-        /* wait */
-    }
+    while (af.test_and_set(memory_order_acquire)) { /* wait */ }
 }
 
 void unlock()