[cfe-commits] r162721 - /cfe/trunk/include/clang/Lex/Lexer.h
Dmitri Gribenko
gribozavr at gmail.com
Mon Aug 27 18:15:46 PDT 2012
Author: gribozavr
Date: Mon Aug 27 20:15:46 2012
New Revision: 162721
URL: http://llvm.org/viewvc/llvm-project?rev=162721&view=rev
Log:
Fix a -Wdocumentation warning.
Modified:
cfe/trunk/include/clang/Lex/Lexer.h
Modified: cfe/trunk/include/clang/Lex/Lexer.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/Lexer.h?rev=162721&r1=162720&r2=162721&view=diff
==============================================================================
--- cfe/trunk/include/clang/Lex/Lexer.h (original)
+++ cfe/trunk/include/clang/Lex/Lexer.h Mon Aug 27 20:15:46 2012
@@ -31,11 +31,11 @@
enum ConflictMarkerKind {
/// Not within a conflict marker.
CMK_None,
- /// A normal or diff3 conflict marker, initiated by at least 7 <s,
- /// separated by at least 7 =s or |s, and terminated by at least 7 >s.
+ /// A normal or diff3 conflict marker, initiated by at least 7 "<"s,
+ /// separated by at least 7 "="s or "|"s, and terminated by at least 7 ">"s.
CMK_Normal,
- /// A Perforce-style conflict marker, initiated by 4 >s, separated by 4 =s,
- /// and terminated by 4 <s.
+ /// A Perforce-style conflict marker, initiated by 4 ">"s,
+ /// separated by 4 "="s, and terminated by 4 "<"s.
CMK_Perforce
};
More information about the cfe-commits
mailing list