From 97f930efd5aaab3489bae1c79353726950d6e360 Mon Sep 17 00:00:00 2001
From: Jiangtao Hu <boris.hu@gmail.com>
Date: Tue, 18 Sep 2018 10:24:00 -0700
Subject: [PATCH] driver: fix lint error.

---
 .../radar/ultrasonic_radar/ultrasonic_radar_canbus.cc     | 4 ++--
 .../ultrasonic_radar/ultrasonic_radar_canbus_component.h  | 8 +++++---
 .../ultrasonic_radar/ultrasonic_radar_message_manager.h   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus.cc b/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus.cc
index 8f50eb5c58..9fe09362e2 100644
--- a/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus.cc
+++ b/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus.cc
@@ -44,8 +44,8 @@ std::string UltrasonicRadarCanbus::Name() const {
 apollo::common::Status UltrasonicRadarCanbus::Init(
   const std::string& config_path,
   const std::shared_ptr<::apollo::cybertron::Writer<Ultrasonic>>& writer) {
-
-  if (!apollo::common::util::GetProtoFromFile(config_path, &ultrasonic_radar_conf_)) {
+  if (!apollo::common::util::GetProtoFromFile(config_path,
+                                              &ultrasonic_radar_conf_)) {
     return OnError("Unable to load canbus conf file: " + config_path);
   }
 
diff --git a/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus_component.h b/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus_component.h
index 5a404e2cfb..aeecb36880 100644
--- a/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus_component.h
+++ b/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus_component.h
@@ -14,8 +14,10 @@
  * limitations under the License.
  *****************************************************************************/
 
-#ifndef MODULES_DRIVERS_RADAR_ULTRASONIC_RADAR_ULTRASONIC_RADAR_CANBUS_COMPONENT_H_
-#define MODULES_DRIVERS_RADAR_ULTRASONIC_RADAR_ULTRASONIC_RADAR_CANBUS_COMPONENT_H_
+#ifndef MODULES_DRIVERS_RADAR_ULTRASONIC_RADAR_ULTRASONIC_RADAR_CANBUS_COMPONENT_H_  // NOLINT
+#define MODULES_DRIVERS_RADAR_ULTRASONIC_RADAR_ULTRASONIC_RADAR_CANBUS_COMPONENT_H_  // NOLINT
+
+#include <memory>
 
 #include "modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_canbus.h"
 
@@ -43,5 +45,5 @@ CYBERTRON_REGISTER_COMPONENT(UltrasonicRadarCanbusComponent)
 }  // namespace drivers
 }  // namespace apollo
 
-#endif // MODULES_DRIVERS_RADAR_ULTRASONIC_RADAR_ULTRASONIC_RADAR_CANBUS_COMPONENT_H_
+#endif // MODULES_DRIVERS_RADAR_ULTRASONIC_RADAR_ULTRASONIC_RADAR_CANBUS_COMPONENT_H_  // NOLINT
 
diff --git a/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_message_manager.h b/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_message_manager.h
index 50373e4918..8f6f8d4fc0 100644
--- a/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_message_manager.h
+++ b/modules/drivers/radar/ultrasonic_radar/ultrasonic_radar_message_manager.h
@@ -54,7 +54,7 @@ class UltrasonicRadarMessageManager : public MessageManager<Ultrasonic> {
 
  private:
   int entrance_num_ = 0;
-  std::shared_ptr<::apollo::cybertron::Writer<Ultrasonic>> ultrasonic_radar_writer_;
+  std::shared_ptr<cybertron::Writer<Ultrasonic>> ultrasonic_radar_writer_;
   std::shared_ptr<CanClient> can_client_;
 };
 
-- 
GitLab