hidl: thermal: Use pragma once

Change-Id: I1fe3e3dc93fc1e16c37699582a26c362ce095ac0

diff --git a/hidl/thermal/Thermal.h b/hidl/thermal/Thermal.h
index 317936f589d5a18eeecd4d75d4cc139b46898845..de17b17f6d94fcf373d64ea489c11e082d59781c 100644 (file)
--- a/hidl/thermal/Thermal.h
+++ b/hidl/thermal/Thermal.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2018 The Android Open Source Project
+ *               2022 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ANDROID_HARDWARE_THERMAL_V2_0_CROSSHATCH_THERMAL_H
-#define ANDROID_HARDWARE_THERMAL_V2_0_CROSSHATCH_THERMAL_H
+
+#pragma once
 
 #include <mutex>
 #include <thread>
@@ -91,5 +92,3 @@ class Thermal : public IThermal {
 }  // namespace thermal
 }  // namespace hardware
 }  // namespace android
-
-#endif  // ANDROID_HARDWARE_THERMAL_V2_0_CROSSHATCH_THERMAL_H

diff --git a/hidl/thermal/thermal-helper.h b/hidl/thermal/thermal-helper.h
index 5eb389ee6d93971b440851607ea940787e09de56..522649421da085872c11d851d592311af89296e2 100644 (file)
--- a/hidl/thermal/thermal-helper.h
+++ b/hidl/thermal/thermal-helper.h
@@ -27,8 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef THERMAL_THERMAL_HELPER_H__
-#define THERMAL_THERMAL_HELPER_H__
+#pragma once
 
 #include <array>
 #include <chrono>
@@ -136,5 +135,3 @@ class ThermalHelper {
 }  // namespace thermal
 }  // namespace hardware
 }  // namespace android
-
-#endif  // THERMAL_THERMAL_HELPER_H__

diff --git a/hidl/thermal/utils/config_parser.h b/hidl/thermal/utils/config_parser.h
index fe43594f899e032b98f88abc4609e5a317befa2f..0dba9cfe915db4f0fd1c60e1bac9383298db7569 100644 (file)
--- a/hidl/thermal/utils/config_parser.h
+++ b/hidl/thermal/utils/config_parser.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef THERMAL_UTILS_CONFIG_PARSER_H__
-#define THERMAL_UTILS_CONFIG_PARSER_H__
+#pragma once
 
 #include <map>
 #include <string>
@@ -55,5 +54,3 @@ std::map<std::string, CoolingType> ParseCoolingDevice(std::string_view config_pa
 }  // namespace thermal
 }  // namespace hardware
 }  // namespace android
-
-#endif  // THERMAL_UTILS_CONFIG_PARSER_H__

diff --git a/hidl/thermal/utils/thermal_files.h b/hidl/thermal/utils/thermal_files.h
index d2c86dd5ff1084db08628ade32fe247605790df1..42e3eb1ac020404b03e390148a912c316b15da72 100644 (file)
--- a/hidl/thermal/utils/thermal_files.h
+++ b/hidl/thermal/utils/thermal_files.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef THERMAL_UTILS_THERMAL_FILES_H_
-#define THERMAL_UTILS_THERMAL_FILES_H_
+#pragma once
 
 #include <string>
 #include <unordered_map>
@@ -51,5 +50,3 @@ class ThermalFiles {
 }  // namespace thermal
 }  // namespace hardware
 }  // namespace android
-
-#endif  // THERMAL_UTILS_THERMAL_FILES_H_

diff --git a/hidl/thermal/utils/thermal_watcher.h b/hidl/thermal/utils/thermal_watcher.h
index f8cd044923399a7ccffb69658a6648d7f4c4dc2f..ddfb46c90e346826de858a3dc79f9e834f6661f9 100644 (file)
--- a/hidl/thermal/utils/thermal_watcher.h
+++ b/hidl/thermal/utils/thermal_watcher.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef THERMAL_UTILS_THERMAL_WATCHER_H_
-#define THERMAL_UTILS_THERMAL_WATCHER_H_
+
+#pragma once
 
 #include <chrono>
 #include <condition_variable>
@@ -101,5 +101,3 @@ class ThermalWatcher : public ::android::Thread {
 }  // namespace thermal
 }  // namespace hardware
 }  // namespace android
-
-#endif  // THERMAL_UTILS_THERMAL_WATCHER_H_