From 6079b1dcdf6e9359048d23067629a5d14f361913 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 7 Sep 2015 22:52:39 +0200 Subject: [PATCH] sanity: soften the class.*{ check * src/sanity/style.test: Allow { on the same line as "enum class". --- src/sanity/style.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sanity/style.test b/src/sanity/style.test index bbcdfd20f..4add43e81 100755 --- a/src/sanity/style.test +++ b/src/sanity/style.test @@ -181,7 +181,7 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do $GREP 'namespace .*{' $tmp && diag 'Opening { should be on its own line.' - $GREP 'class .*{' $tmp && + $GREP 'class .*{' $tmp | $GREP -v enum && diag 'Opening { should be on its own line.' $GREP '( ' $tmp && @@ -244,7 +244,7 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do diag 'No useless parentheses after return.' $GREP 'NULL' $tmp && - diag 'Use 0 instead of NULL. NULL is not portable.' + diag 'Use nullptr instead of NULL.' # std::list::size() can be O(n). Better use empty() whenever # possible, even for other containers.