This revision was automatically updated to reflect the committed changes.
Closed by commit rL334709: clang-format: Fix documentation generation (authored
by Typz, committed by ).
Herald added a subscriber: llvm-commits.
Repository:
rL LLVM
https://reviews.llvm.org/D48161
Files:
cfe/trunk/docs/ClangFormatStyleOptions.rst
cfe/trunk/include/clang/Format/Format.h
Index: cfe/trunk/include/clang/Format/Format.h
===================================================================
--- cfe/trunk/include/clang/Format/Format.h
+++ cfe/trunk/include/clang/Format/Format.h
@@ -840,24 +840,24 @@
enum BreakConstructorInitializersStyle {
/// Break constructor initializers before the colon and after the commas.
/// \code
- /// Constructor()
- /// : initializer1(),
- /// initializer2()
+ /// Constructor()
+ /// : initializer1(),
+ /// initializer2()
/// \endcode
BCIS_BeforeColon,
/// Break constructor initializers before the colon and commas, and align
/// the commas with the colon.
/// \code
- /// Constructor()
- /// : initializer1()
- /// , initializer2()
+ /// Constructor()
+ /// : initializer1()
+ /// , initializer2()
/// \endcode
BCIS_BeforeComma,
/// Break constructor initializers after the colon and commas.
/// \code
- /// Constructor() :
- /// initializer1(),
- /// initializer2()
+ /// Constructor() :
+ /// initializer1(),
+ /// initializer2()
/// \endcode
BCIS_AfterColon
};
@@ -897,25 +897,27 @@
enum BreakInheritanceListStyle {
/// Break inheritance list before the colon and after the commas.
/// \code
- /// class Foo
- /// : Base1,
- /// Base2
- /// {};
+ /// class Foo
+ /// : Base1,
+ /// Base2
+ /// {};
/// \endcode
BILS_BeforeColon,
/// Break inheritance list before the colon and commas, and align
/// the commas with the colon.
/// \code
- /// Constructor()
- /// : initializer1()
- /// , initializer2()
+ /// class Foo
+ /// : Base1
+ /// , Base2
+ /// {};
/// \endcode
BILS_BeforeComma,
/// Break inheritance list after the colon and commas.
/// \code
- /// Constructor() :
- /// initializer1(),
- /// initializer2()
+ /// class Foo :
+ /// Base1,
+ /// Base2
+ /// {};
/// \endcode
BILS_AfterColon
};
Index: cfe/trunk/docs/ClangFormatStyleOptions.rst
===================================================================
--- cfe/trunk/docs/ClangFormatStyleOptions.rst
+++ cfe/trunk/docs/ClangFormatStyleOptions.rst
@@ -1019,28 +1019,28 @@
.. code-block:: c++
- Constructor()
- : initializer1(),
- initializer2()
+ Constructor()
+ : initializer1(),
+ initializer2()
* ``BCIS_BeforeComma`` (in configuration: ``BeforeComma``)
Break constructor initializers before the colon and commas, and align
the commas with the colon.
.. code-block:: c++
- Constructor()
- : initializer1()
- , initializer2()
+ Constructor()
+ : initializer1()
+ , initializer2()
* ``BCIS_AfterColon`` (in configuration: ``AfterColon``)
Break constructor initializers after the colon and commas.
.. code-block:: c++
- Constructor() :
- initializer1(),
- initializer2()
+ Constructor() :
+ initializer1(),
+ initializer2()
@@ -1054,29 +1054,31 @@
.. code-block:: c++
- class Foo
- : Base1,
- Base2
- {};
+ class Foo
+ : Base1,
+ Base2
+ {};
* ``BILS_BeforeComma`` (in configuration: ``BeforeComma``)
Break inheritance list before the colon and commas, and align
the commas with the colon.
.. code-block:: c++
- Constructor()
- : initializer1()
- , initializer2()
+ class Foo
+ : Base1
+ , Base2
+ {};
* ``BILS_AfterColon`` (in configuration: ``AfterColon``)
Break inheritance list after the colon and commas.
.. code-block:: c++
- Constructor() :
- initializer1(),
- initializer2()
+ class Foo :
+ Base1,
+ Base2
+ {};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
