This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 3f9a01c14cd232c8d1a3ecf552b42df131bbdd6e (commit) via 18df6a9a78fc0b450bd37d4394c7422cd56ec12b (commit) from 6de0012188c436d5a6fb84a7fd483f818de5ec1b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f9a01c14cd232c8d1a3ecf552b42df131bbdd6e commit 3f9a01c14cd232c8d1a3ecf552b42df131bbdd6e Merge: 6de0012 18df6a9 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed May 11 11:06:40 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed May 11 11:06:40 2016 -0400 Merge topic 'clang-format-prep' into next 18df6a9a Tests: Protect unicode literals from clang-format Cpp03 formatting https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18df6a9a78fc0b450bd37d4394c7422cd56ec12b commit 18df6a9a78fc0b450bd37d4394c7422cd56ec12b Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed May 11 10:36:51 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed May 11 10:37:45 2016 -0400 Tests: Protect unicode literals from clang-format Cpp03 formatting Since CMake is written in C++98 any clang-format configuration must set `Standard` to `Cpp03` so that `A<A<int> >` is not rewritten as `A<A<int>>`. However, this will cause `U"foo"` to be rewritten as `U "foo"`. Add markup to turn clang-format off in the one place that the latter case occurs so that we do not need a separate `.clang-format` config file for it. Inspired-by: Daniel Pfeifer <dan...@pfeifer-mail.de> diff --git a/Tests/CompileFeatures/cxx_unicode_literals.cpp b/Tests/CompileFeatures/cxx_unicode_literals.cpp index a7b7df0..7794c11 100644 --- a/Tests/CompileFeatures/cxx_unicode_literals.cpp +++ b/Tests/CompileFeatures/cxx_unicode_literals.cpp @@ -1,3 +1,5 @@ +/* clang-format off */ const char16_t lit_16[] = u"\u00DA"; const char32_t lit_32[] = U"\u00DA"; +/* clang-format on */ ----------------------------------------------------------------------- Summary of changes: Tests/CompileFeatures/cxx_unicode_literals.cpp | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits