diff --git a/source/basic.tex b/source/basic.tex index a813f68d9c..2e3bf9c13f 100644 --- a/source/basic.tex +++ b/source/basic.tex @@ -6907,14 +6907,14 @@ \end{note} \pnum -Two actions are \defn{potentially concurrent} if +Two evaluations are \defn{potentially concurrent} if \begin{itemize} \item they are performed by different threads, or \item they are unsequenced, at least one is performed by a signal handler, and they are not both performed by the same signal handler invocation. \end{itemize} The execution of a program contains a \defn{data race} if it contains two -potentially concurrent conflicting actions, at least one of which is not atomic, +potentially concurrent conflicting evaluations, at least one of which is not atomic, and neither happens before the other, except for the special case for signal handlers described below. Any such data race results in undefined @@ -6997,7 +6997,7 @@ \end{note} \pnum -Executions of atomic functions +Executions of atomic operations that are either defined to be lock-free\iref{atomics.flag} or indicated as lock-free\iref{atomics.lockfree} are \defnx{lock-free executions}{lock-free execution}.