Author: void Date: Mon Aug 18 00:15:18 2014 New Revision: 215876 URL: http://llvm.org/viewvc/llvm-project?rev=215876&view=rev Log: Merging r215807: ------------------------------------------------------------------------ r215807 | nicholas | 2014-08-15 19:11:54 -0700 (Fri, 15 Aug 2014) | 2 lines
Try indenting to put all the text inside the block. ------------------------------------------------------------------------ Modified: cfe/branches/release_35/ (props changed) cfe/branches/release_35/docs/AttributeReference.rst Propchange: cfe/branches/release_35/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 18 00:15:18 2014 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471,214734-214735,214777,215046,215229,215245,215806 +/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471,214734-214735,214777,215046,215229,215245,215806-215807 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_35/docs/AttributeReference.rst URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/docs/AttributeReference.rst?rev=215876&r1=215875&r2=215876&view=diff ============================================================================== --- cfe/branches/release_35/docs/AttributeReference.rst (original) +++ cfe/branches/release_35/docs/AttributeReference.rst Mon Aug 18 00:15:18 2014 @@ -237,9 +237,9 @@ enable_if "X","","","" .. Note:: Some features of this attribute are experimental. The meaning of -multiple enable_if attributes on a single declaration is subject to change in -a future version of clang. Also, the ABI is not standardized and the mangled -name produced may change. To avoid that, use asm labels. + multiple enable_if attributes on a single declaration is subject to change in + a future version of clang. Also, the ABI is not standardized and the mangled + name produced may change. To avoid that, use asm labels. The ``enable_if`` attribute can be placed on function declarations to control which overload is selected based on the values of the function's arguments. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits