diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2017-11-09 15:54:59 +0000 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2017-11-09 15:54:59 +0000 |
| commit | d4102df9ad5b4456fc98013d9ef49834ac236b14 (patch) | |
| tree | 8acf96a6cc02229ad27c137b581e200c6b88ca9d | |
| parent | e9b7c0a39280e66926c8f89c78b9db048aaff6bb (diff) | |
| download | bcm5719-llvm-d4102df9ad5b4456fc98013d9ef49834ac236b14.tar.gz bcm5719-llvm-d4102df9ad5b4456fc98013d9ef49834ac236b14.zip | |
[clang-format] Keep Sphinx happy after r317794
llvm-svn: 317799
| -rw-r--r-- | clang/docs/ClangFormatStyleOptions.rst | 11 | ||||
| -rw-r--r-- | clang/include/clang/Format/Format.h | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 1b9387cd6ee..8e3c5dad3c9 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -1584,11 +1584,6 @@ the configuration (without a prefix: ``Auto``). **SortUsingDeclarations** (``bool``) If ``true``, clang-format will sort using declarations. - .. code-block:: c++ - - false: true: - using std::cout; vs. using std::cin; - using std::cin; using std::cout; The order of using declarations is defined as follows: Split the strings by "::" and discard any initial empty strings. The last element of each list is a non-namespace name; all others are namespace @@ -1597,6 +1592,12 @@ the configuration (without a prefix: ``Auto``). names, and within those groups, names are in case-insensitive lexicographic order. + .. code-block:: c++ + + false: true: + using std::cout; vs. using std::cin; + using std::cin; using std::cout; + **SpaceAfterCStyleCast** (``bool``) If ``true``, a space is inserted after C style casts. diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 7be794e9597..fcca42d620f 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -1385,11 +1385,7 @@ struct FormatStyle { bool SortIncludes; /// \brief If ``true``, clang-format will sort using declarations. - /// \code - /// false: true: - /// using std::cout; vs. using std::cin; - /// using std::cin; using std::cout; - /// \endcode + /// /// The order of using declarations is defined as follows: /// Split the strings by "::" and discard any initial empty strings. The last /// element of each list is a non-namespace name; all others are namespace @@ -1397,6 +1393,11 @@ struct FormatStyle { /// individual names is that all non-namespace names come before all namespace /// names, and within those groups, names are in case-insensitive /// lexicographic order. + /// \code + /// false: true: + /// using std::cout; vs. using std::cin; + /// using std::cin; using std::cout; + /// \endcode bool SortUsingDeclarations; /// \brief If ``true``, a space is inserted after C style casts. |
