diff --git a/src/node_http2.h b/src/node_http2.h index b416243823a09d..3e90c49cd77b6b 100644 --- a/src/node_http2.h +++ b/src/node_http2.h @@ -333,7 +333,6 @@ class Http2Options { static const size_t kAllocBufferSize = 64 * 1024; -//// typedef uint32_t(*get_setting)(nghttp2_session* session, nghttp2_settings_id id); diff --git a/tools/cpplint.py b/tools/cpplint.py index 845f2d2f39de01..241195f0762709 100644 --- a/tools/cpplint.py +++ b/tools/cpplint.py @@ -3021,7 +3021,7 @@ def CheckComment(line, filename, linenum, next_line_start, error): # If the comment contains an alphanumeric character, there # should be a space somewhere between it and the // unless # it's a /// or //! Doxygen comment. - if (Match(r'//[^ ]*\w', comment) and + if (Match(r'(?://[^ ]*\w)|(?:////\s*$)', comment) and not Match(r'(///|//\!)(\s+|$)', comment)): error(filename, linenum, 'whitespace/comments', 4, 'Should have a space between // and comment')