summaryrefslogtreecommitdiffstats
path: root/clang/docs
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-12-18 22:20:15 +0000
committerZachary Turner <zturner@google.com>2015-12-18 22:20:15 +0000
commit448592eeac7d514243f09f38368dfa794e27aefa (patch)
treec4d0e4878e679208ee2812e695d07f7e5dbc7f04 /clang/docs
parent82b8d4e6fd79e8ff84d9c16a10822ec0c08c835b (diff)
downloadbcm5719-llvm-448592eeac7d514243f09f38368dfa794e27aefa.tar.gz
bcm5719-llvm-448592eeac7d514243f09f38368dfa794e27aefa.zip
Support AlwaysBreakAfterReturnType
This changes the behavior of AlwaysBreakAfterDeclarationReturnType so that it supports breaking after declarations, definitions, or both. Differential Revision: http://reviews.llvm.org/D10370 Reviewed By: Daniel Jasper llvm-svn: 256046
Diffstat (limited to 'clang/docs')
-rw-r--r--clang/docs/ClangFormatStyleOptions.rst23
1 files changed, 21 insertions, 2 deletions
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index 9b4ffe300fe..bfabd5985ca 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -254,7 +254,8 @@ the configuration (without a prefix: ``Auto``).
single line.
**AlwaysBreakAfterDefinitionReturnType** (``DefinitionReturnTypeBreakingStyle``)
- The function definition return type breaking style to use.
+ The function definition return type breaking style to use. This
+ option is deprecated and is retained for backwards compatibility.
Possible values:
@@ -264,7 +265,25 @@ the configuration (without a prefix: ``Auto``).
* ``DRTBS_All`` (in configuration: ``All``)
Always break after the return type.
* ``DRTBS_TopLevel`` (in configuration: ``TopLevel``)
- Always break after the return types of top level functions.
+ Always break after the return types of top-level functions.
+
+
+**AlwaysBreakAfterReturnType** (``ReturnTypeBreakingStyle``)
+ The function declaration return type breaking style to use.
+
+ Possible values:
+
+ * ``RTBS_None`` (in configuration: ``None``)
+ Break after return type automatically.
+ ``PenaltyReturnTypeOnItsOwnLine`` is taken into account.
+ * ``RTBS_All`` (in configuration: ``All``)
+ Always break after the return type.
+ * ``RTBS_TopLevel`` (in configuration: ``TopLevel``)
+ Always break after the return types of top-level functions.
+ * ``RTBS_AllDefinitions`` (in configuration: ``AllDefinitions``)
+ Always break after the return type of function definitions.
+ * ``RTBS_TopLevelDefinitions`` (in configuration: ``TopLevelDefinitions``)
+ Always break after the return type of top-level definitions.
**AlwaysBreakBeforeMultilineStrings** (``bool``)
OpenPOWER on IntegriCloud