From 605b563c759de7810d4d5ebda41e621745c4d143 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 13 Jan 2022 20:46:52 +0000 Subject: [PATCH] hidl: thermal: Use pragma once Change-Id: I1fe3e3dc93fc1e16c37699582a26c362ce095ac0 --- hidl/thermal/Thermal.h | 7 +++---- hidl/thermal/thermal-helper.h | 5 +---- hidl/thermal/utils/config_parser.h | 5 +---- hidl/thermal/utils/thermal_files.h | 5 +---- hidl/thermal/utils/thermal_watcher.h | 6 ++---- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/hidl/thermal/Thermal.h b/hidl/thermal/Thermal.h index 317936f..de17b17 100644 --- 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 #include @@ -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 5eb389e..5226494 100644 --- 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 #include @@ -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 fe43594..0dba9cf 100644 --- 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 #include @@ -55,5 +54,3 @@ std::map 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 d2c86dd..42e3eb1 100644 --- 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 #include @@ -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 f8cd044..ddfb46c 100644 --- 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 #include @@ -101,5 +101,3 @@ class ThermalWatcher : public ::android::Thread { } // namespace thermal } // namespace hardware } // namespace android - -#endif // THERMAL_UTILS_THERMAL_WATCHER_H_ -- 2.20.1