[llvm-branch-commits] [cfe-branch] r291952 - Merging r291879:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Jan 13 13:40:22 2017
New Revision: 291952

URL: http://llvm.org/viewvc/llvm-project?rev=291952&view=rev
Log:
Merging r291879:
------------------------------------------------------------------------
r291879 | echristo | 2017-01-12 17:52:04 -0800 (Thu, 12 Jan 2017) | 1 line

Add a necessary newline for diagnose_if documentation.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_40/   (props changed)
    cfe/branches/release_40/include/clang/Basic/AttrDocs.td

Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 13:40:22 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291881,291907
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_40/include/clang/Basic/AttrDocs.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/include/clang/Basic/AttrDocs.td?rev=291952&r1=291951&r2=291952&view=diff
==============================================================================
--- cfe/branches/release_40/include/clang/Basic/AttrDocs.td (original)
+++ cfe/branches/release_40/include/clang/Basic/AttrDocs.td Fri Jan 13 13:40:22 2017
@@ -386,6 +386,7 @@ warnings or errors at compile-time if ca
 certain user-defined criteria. For example:
 
 .. code-block:: c
+
   void abs(int a)
     __attribute__((diagnose_if(a >= 0, "Redundant abs call", "warning")));
   void must_abs(int a)