Upgrade cpplint

Makefile

@@ -671,18 +671,12 @@ jslint-ci:
 		tools/eslint-rules tools/jslint.js
 
 CPPLINT_EXCLUDE ?=
-CPPLINT_EXCLUDE += src/node_lttng.cc
 CPPLINT_EXCLUDE += src/node_root_certs.h
-CPPLINT_EXCLUDE += src/node_lttng_tp.h
-CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
 CPPLINT_EXCLUDE += src/queue.h
 CPPLINT_EXCLUDE += src/tree.h
-CPPLINT_EXCLUDE += src/v8abbr.h
 CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
 
 CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \
-	deps/debugger-agent/include/* \
-	deps/debugger-agent/src/* \
 	src/*.c \
 	src/*.cc \
 	src/*.h \

src/async-wrap.cc

@@ -38,11 +38,11 @@ class RetainedAsyncInfo: public RetainedObjectInfo {
  public:
   explicit RetainedAsyncInfo(uint16_t class_id, AsyncWrap* wrap);
 
-  virtual void Dispose() override;
-  virtual bool IsEquivalent(RetainedObjectInfo* other) override;
-  virtual intptr_t GetHash() override;
-  virtual const char* GetLabel() override;
-  virtual intptr_t GetSizeInBytes() override;
+  void Dispose() override;
+  bool IsEquivalent(RetainedObjectInfo* other) override;
+  intptr_t GetHash() override;
+  const char* GetLabel() override;
+  intptr_t GetSizeInBytes() override;
 
  private:
   const char* label_;

src/cares_wrap.cc

@@ -257,7 +257,7 @@ class QueryWrap : public AsyncWrap {
       req_wrap_obj->Set(env->domain_string(), env->domain_array()->Get(0));
   }
 
-  virtual ~QueryWrap() override {
+  ~QueryWrap() override {
     CHECK_EQ(false, persistent().IsEmpty());
     ClearWrap(object());
     persistent().Reset();
@@ -371,11 +371,11 @@ class QueryWrap : public AsyncWrap {
   // Subclasses should implement the appropriate Parse method.
   virtual void Parse(unsigned char* buf, int len) {
     UNREACHABLE();
-  };
+  }
 
   virtual void Parse(struct hostent* host) {
     UNREACHABLE();
-  };
+  }
 };
 
 

src/fs_event_wrap.cc

@@ -35,7 +35,7 @@ class FSEventWrap: public HandleWrap {
 
  private:
   FSEventWrap(Environment* env, Local<Object> object);
-  virtual ~FSEventWrap() override;
+  ~FSEventWrap() override;
 
   static void OnEvent(uv_fs_event_t* handle, const char* filename, int events,
     int status);

src/handle_wrap.h

@@ -55,7 +55,7 @@ class HandleWrap : public AsyncWrap {
              uv_handle_t* handle,
              AsyncWrap::ProviderType provider,
              AsyncWrap* parent = nullptr);
-  virtual ~HandleWrap() override;
+  ~HandleWrap() override;
 
  private:
   friend class Environment;

src/inspector_agent.cc

@@ -240,18 +240,15 @@ class ChannelImpl final : public blink::protocol::FrontendChannel {
   explicit ChannelImpl(AgentImpl* agent): agent_(agent) {}
   virtual ~ChannelImpl() {}
  private:
-  virtual void sendProtocolResponse(int callId,
-                                    const String16& message)
-                                    override {
+  void sendProtocolResponse(int callId, const String16& message) override {
     sendMessageToFrontend(message);
   }
 
-  virtual void sendProtocolNotification(
-      const String16& message) override {
+  void sendProtocolNotification(const String16& message) override {
     sendMessageToFrontend(message);
   }
 
-  virtual void flushProtocolNotifications() override { }
+  void flushProtocolNotifications() override { }
 
   void sendMessageToFrontend(const String16& message) {
     agent_->Write(message.utf8());
@@ -575,23 +572,23 @@ Agent::~Agent() {
 
 void Agent::Start(v8::Platform* platform, int port, bool wait) {
   impl->Start(platform, port, wait);
-};
+}
 
 void Agent::Stop() {
   impl->Stop();
-};
+}
 
 bool Agent::IsStarted() {
   return impl->IsStarted();
-};
+}
 
 bool Agent::IsConnected() {
   return impl->IsConnected();
-};
+}
 
 void Agent::WaitForDisconnect() {
   impl->WaitForDisconnect();
-};
+}
 
 }  // namespace inspector
 }  // namespace node

src/node_buffer.cc

@@ -1248,9 +1248,7 @@ void Swap64(const FunctionCallbackInfo<Value>& args) {
       std::swap(ts_obj_data[i], ts_obj_data[i + 7]);
       std::swap(ts_obj_data[i + 1], ts_obj_data[i + 6]);
       std::swap(ts_obj_data[i + 2], ts_obj_data[i + 5]);
-      // NOLINT added because current cpplint.py is old and doesn't know that
-      // std::swap() now lives in <utility> instead of <algorithm>.
-      std::swap(ts_obj_data[i + 3], ts_obj_data[i + 4]);  // NOLINT
+      std::swap(ts_obj_data[i + 3], ts_obj_data[i + 4]);
     }
   }
 

src/node_contextify.cc

@@ -561,7 +561,8 @@ class ContextifyScript : public BaseObject {
 
     // Do the eval within this context
     Environment* env = Environment::GetCurrent(args);
-    EvalMachine(env, timeout, display_errors, break_on_sigint, args, try_catch);
+    EvalMachine(env, timeout, display_errors, break_on_sigint, args,
+                &try_catch);
   }
 
   // args: sandbox, [options]
@@ -610,7 +611,7 @@ class ContextifyScript : public BaseObject {
                       display_errors,
                       break_on_sigint,
                       args,
-                      try_catch)) {
+                      &try_catch)) {
         contextify_context->CopyProperties();
       }
 
@@ -821,7 +822,7 @@ class ContextifyScript : public BaseObject {
                           const bool display_errors,
                           const bool break_on_sigint,
                           const FunctionCallbackInfo<Value>& args,
-                          TryCatch& try_catch) {
+                          TryCatch* try_catch) {
     if (!ContextifyScript::InstanceOf(env, args.Holder())) {
       env->ThrowTypeError(
           "Script methods can only be called on script instances.");
@@ -855,8 +856,8 @@ class ContextifyScript : public BaseObject {
       result = script->Run();
     }
 
-    if (try_catch.HasCaught()) {
-      if (try_catch.HasTerminated())
+    if (try_catch->HasCaught()) {
+      if (try_catch->HasTerminated())
         env->isolate()->CancelTerminateExecution();
 
       // It is possible that execution was terminated by another timeout in
@@ -873,17 +874,17 @@ class ContextifyScript : public BaseObject {
       // letting try_catch catch it.
       // If execution has been terminated, but not by one of the watchdogs from
       // this invocation, this will re-throw a `null` value.
-      try_catch.ReThrow();
+      try_catch->ReThrow();
 
       return false;
     }
 
     if (result.IsEmpty()) {
       // Error occurred during execution of the script.
       if (display_errors) {
-        DecorateErrorStack(env, try_catch);
+        DecorateErrorStack(env, *try_catch);
       }
-      try_catch.ReThrow();
+      try_catch->ReThrow();
       return false;
     }