Use pragma once in more places (#3182)
* Add a lot of pragma once changes. Now scripted!
* update pragma once in setup payload
* More pragma once
* Pragma once within platform and more
* pragma once in the crypto layer
* pragma once in examples
* Fix by restyle-diff
diff --git a/src/ble/BLEEndPoint.h b/src/ble/BLEEndPoint.h
index 980062c..5d02229 100644
--- a/src/ble/BLEEndPoint.h
+++ b/src/ble/BLEEndPoint.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef BLEENDPOINT_H_
-#define BLEENDPOINT_H_
+#pragma once
#include <system/SystemMutex.h>
@@ -229,5 +228,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BLEENDPOINT_H_ */
diff --git a/src/ble/Ble.h b/src/ble/Ble.h
index be9d0d9..65b02d8 100644
--- a/src/ble/Ble.h
+++ b/src/ble/Ble.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef CHIP_BLE_H
-#define CHIP_BLE_H
+#pragma once
#include <ble/BleConfig.h>
@@ -45,5 +44,3 @@
* This namespace includes all interfaces within chip for
* Bluetooth Low Energy (BLE), also known as Bluetooth Smart.
*/
-
-#endif // CHIP_BLE_H
diff --git a/src/ble/BleApplicationDelegate.h b/src/ble/BleApplicationDelegate.h
index 1eb5ccb..60e0941 100644
--- a/src/ble/BleApplicationDelegate.h
+++ b/src/ble/BleApplicationDelegate.h
@@ -22,8 +22,7 @@
* to a client application.
*/
-#ifndef BLEAPPLICATIONDELEGATE_H_
-#define BLEAPPLICATIONDELEGATE_H_
+#pragma once
#include <ble/BleConfig.h>
@@ -45,5 +44,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BLEAPPLICATIONDELEGATE_H_ */
diff --git a/src/ble/BleConfig.h b/src/ble/BleConfig.h
index 1d5df4b..038d474 100644
--- a/src/ble/BleConfig.h
+++ b/src/ble/BleConfig.h
@@ -33,8 +33,7 @@
*
*/
-#ifndef BLECONFIG_H_
-#define BLECONFIG_H_
+#pragma once
#if CHIP_SEPARATE_CONFIG_H
#include <ble/BleBuildConfig.h>
@@ -234,5 +233,3 @@
// clang-format on
#include <core/CHIPConfig.h>
-
-#endif /* BLECONFIG_H_ */
diff --git a/src/ble/BleConnectionDelegate.h b/src/ble/BleConnectionDelegate.h
index 08dde01..0ab57ea 100644
--- a/src/ble/BleConnectionDelegate.h
+++ b/src/ble/BleConnectionDelegate.h
@@ -21,8 +21,7 @@
* to BleLayer.
*/
-#ifndef BLE_CONNECTION_DELEGATE_H_
-#define BLE_CONNECTION_DELEGATE_H_
+#pragma once
#include <ble/BleConfig.h>
#include <ble/BleError.h>
@@ -56,5 +55,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BLE_CONNECTION_DELEGATE_H_ */
diff --git a/src/ble/BleError.h b/src/ble/BleError.h
index a67364b..86ccd48 100644
--- a/src/ble/BleError.h
+++ b/src/ble/BleError.h
@@ -28,8 +28,7 @@
*
*/
-#ifndef BLEERROR_H_
-#define BLEERROR_H_
+#pragma once
#include "BleConfig.h"
@@ -425,5 +424,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BLEERROR_H_ */
diff --git a/src/ble/BleLayer.h b/src/ble/BleLayer.h
index 4785da1..12f64c4 100644
--- a/src/ble/BleLayer.h
+++ b/src/ble/BleLayer.h
@@ -45,8 +45,7 @@
* stack.
*/
-#ifndef BLELAYER_H_
-#define BLELAYER_H_
+#pragma once
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
@@ -356,5 +355,3 @@
} /* namespace chip */
#include "BLEEndPoint.h"
-
-#endif /* BLELAYER_H_ */
diff --git a/src/ble/BlePlatformDelegate.h b/src/ble/BlePlatformDelegate.h
index eab78e6..9dd2cf5 100644
--- a/src/ble/BlePlatformDelegate.h
+++ b/src/ble/BlePlatformDelegate.h
@@ -22,8 +22,7 @@
* to a platform's BLE framework.
*/
-#ifndef BLEPLATFORMDELEGATE_H_
-#define BLEPLATFORMDELEGATE_H_
+#pragma once
#include <ble/BleConfig.h>
@@ -93,5 +92,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BLEPLATFORMDELEGATE_H_ */
diff --git a/src/ble/BleUUID.h b/src/ble/BleUUID.h
index bf5f540..76fe0f3 100644
--- a/src/ble/BleUUID.h
+++ b/src/ble/BleUUID.h
@@ -15,8 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef BLEUUID_H_
-#define BLEUUID_H_
+#pragma once
#include <stdint.h>
@@ -40,5 +39,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BLEUUID_H_ */
diff --git a/src/ble/BtpEngine.h b/src/ble/BtpEngine.h
index 15051df..d182707 100644
--- a/src/ble/BtpEngine.h
+++ b/src/ble/BtpEngine.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef BTP_ENGINE_H_
-#define BTP_ENGINE_H_
+#pragma once
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
@@ -186,5 +185,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif /* BTP_ENGINE_H_ */
diff --git a/src/ble/CHIPBleServiceData.h b/src/ble/CHIPBleServiceData.h
index 54fa48b..1293e14 100644
--- a/src/ble/CHIPBleServiceData.h
+++ b/src/ble/CHIPBleServiceData.h
@@ -21,8 +21,7 @@
* Definitions for chip BLE service advertisement data.
*/
-#ifndef CHIP_BLE_SERVICE_DATA_H
-#define CHIP_BLE_SERVICE_DATA_H
+#pragma once
#include <core/CHIPEncoding.h>
@@ -85,5 +84,3 @@
} /* namespace Ble */
} /* namespace chip */
-
-#endif // CHIP_BLE_SERVICE_DATA_H
diff --git a/src/ble/tests/TestBleLayer.h b/src/ble/tests/TestBleLayer.h
index aa6a0e3..30d850e 100644
--- a/src/ble/tests/TestBleLayer.h
+++ b/src/ble/tests/TestBleLayer.h
@@ -22,10 +22,7 @@
*
*/
-#ifndef TESTBLELAYER_H
-#define TESTBLELAYER_H
+#pragma once
int TestBleErrorStr();
int TestBleUUID();
-
-#endif // TESTBLELAYER_H
