maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] Keep Sphinx happy after r317794 

llvm-svn: 317799
This commit is contained in:
Krasimir Georgiev 2017-11-09 15:54:59 +00:00
parent e9b7c0a392
commit d4102df9ad
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/docs/ClangFormatStyleOptions.rst
View File

@ -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.

11
clang/include/clang/Format/Format.h
View File

@ -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.