Revise C++ coding style using clang-format-6.0

Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.
This commit is contained in:
Kitware Robot
2018-06-01 09:53:41 -04:00
committed by Brad King
parent 12fed3edb1
commit d7204e649e
445 changed files with 3734 additions and 3181 deletions

View File

@@ -1,36 +1,36 @@
#ifndef EXPECT_FINAL
#error EXPECT_FINAL not defined
# error EXPECT_FINAL not defined
#endif
#ifndef EXPECT_INHERITING_CONSTRUCTORS
#error EXPECT_INHERITING_CONSTRUCTORS not defined
# error EXPECT_INHERITING_CONSTRUCTORS not defined
#endif
#ifndef EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL
#error EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL not defined
# error EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL not defined
#endif
#ifndef EXPECT_OVERRIDE_CONTROL
#error EXPECT_OVERRIDE_CONTROL not defined
# error EXPECT_OVERRIDE_CONTROL not defined
#endif
#ifdef TEST_CXX_STD
#if !HAVE_CXX_STD_11
#error HAVE_CXX_STD_11 is false with CXX_STANDARD == 11
#endif
#if HAVE_CXX_STD_14
#error HAVE_CXX_STD_14 is true with CXX_STANDARD == 11
#endif
#if HAVE_CXX_STD_17
#error HAVE_CXX_STD_17 is true with CXX_STANDARD == 11
#endif
# if !HAVE_CXX_STD_11
# error HAVE_CXX_STD_11 is false with CXX_STANDARD == 11
# endif
# if HAVE_CXX_STD_14
# error HAVE_CXX_STD_14 is true with CXX_STANDARD == 11
# endif
# if HAVE_CXX_STD_17
# error HAVE_CXX_STD_17 is true with CXX_STANDARD == 11
# endif
#endif
#if !HAVE_OVERRIDE_CONTROL
#if EXPECT_OVERRIDE_CONTROL
#error "Expect override control feature"
#endif
# if EXPECT_OVERRIDE_CONTROL
# error "Expect override control feature"
# endif
#else
#if !EXPECT_OVERRIDE_CONTROL
#error "Expect no override control feature"
#endif
# if !EXPECT_OVERRIDE_CONTROL
# error "Expect no override control feature"
# endif
struct A
{
@@ -45,37 +45,37 @@ struct B final : A
#endif
#if !HAVE_AUTO_TYPE
#error Expect cxx_auto_type support
# error Expect cxx_auto_type support
#endif
#if !HAVE_INHERITING_CONSTRUCTORS
#if EXPECT_INHERITING_CONSTRUCTORS
#error Expect cxx_inheriting_constructors support
#endif
# if EXPECT_INHERITING_CONSTRUCTORS
# error Expect cxx_inheriting_constructors support
# endif
#else
#if !EXPECT_INHERITING_CONSTRUCTORS
#error Expect no cxx_inheriting_constructors support
#endif
# if !EXPECT_INHERITING_CONSTRUCTORS
# error Expect no cxx_inheriting_constructors support
# endif
#endif
#if !HAVE_FINAL
#if EXPECT_FINAL
#error Expect cxx_final support
#endif
# if EXPECT_FINAL
# error Expect cxx_final support
# endif
#else
#if !EXPECT_FINAL
#error Expect no cxx_final support
#endif
# if !EXPECT_FINAL
# error Expect no cxx_final support
# endif
#endif
#if !HAVE_INHERITING_CONSTRUCTORS_AND_FINAL
#if EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL
#error Expect cxx_inheriting_constructors and cxx_final support
#endif
# if EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL
# error Expect cxx_inheriting_constructors and cxx_final support
# endif
#else
#if !EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL
#error Expect no combined cxx_inheriting_constructors and cxx_final support
#endif
# if !EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL
# error Expect no combined cxx_inheriting_constructors and cxx_final support
# endif
#endif
int main()