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/examples/chip-tool/commands/clusters/BarrierControl/Commands.h b/examples/chip-tool/commands/clusters/BarrierControl/Commands.h
index 5928d51..34a400f 100644
--- a/examples/chip-tool/commands/clusters/BarrierControl/Commands.h
+++ b/examples/chip-tool/commands/clusters/BarrierControl/Commands.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_BARRIERCONTROL_COMMANDS_H__
-#define __CHIPTOOL_BARRIERCONTROL_COMMANDS_H__
+#pragma once
#include "../../common/ModelCommand.h"
@@ -61,5 +60,3 @@
commands.Register(clusterName, clusterCommands);
}
-
-#endif // __CHIPTOOL_BARRIERCONTROL_COMMANDS_H__
diff --git a/examples/chip-tool/commands/clusters/Commands.h b/examples/chip-tool/commands/clusters/Commands.h
index ff45eb0..e887cc2 100644
--- a/examples/chip-tool/commands/clusters/Commands.h
+++ b/examples/chip-tool/commands/clusters/Commands.h
@@ -18,8 +18,7 @@
//
//
-#ifndef __CHIPTOOL_CLUSTERS_COMMANDS_H__
-#define __CHIPTOOL_CLUSTERS_COMMANDS_H__
+#pragma once
#include "../common/ModelCommand.h"
@@ -3677,5 +3676,3 @@
registerClusterScenes(commands);
registerClusterTemperatureMeasurement(commands);
}
-
-#endif // __CHIPTOOL_CLUSTERS_COMMANDS_H__
diff --git a/examples/chip-tool/commands/clusters/DoorLock/Commands.h b/examples/chip-tool/commands/clusters/DoorLock/Commands.h
index 272c992..8b582fb 100644
--- a/examples/chip-tool/commands/clusters/DoorLock/Commands.h
+++ b/examples/chip-tool/commands/clusters/DoorLock/Commands.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_DOORLOCK_COMMANDS_H__
-#define __CHIPTOOL_DOORLOCK_COMMANDS_H__
+#pragma once
#include "../../common/ModelCommand.h"
@@ -61,5 +60,3 @@
commands.Register(clusterName, clusterCommands);
}
-
-#endif // __CHIPTOOL_DOORLOCK_COMMANDS_H__
diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
index 612374e..ca9448f 100644
--- a/examples/chip-tool/commands/common/Command.h
+++ b/examples/chip-tool/commands/common/Command.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_COMMAND_H__
-#define __CHIPTOOL_COMMAND_H__
+#pragma once
#include <controller/CHIPDeviceController.h>
#include <inet/InetInterface.h>
@@ -110,5 +109,3 @@
const char * mName = nullptr;
std::vector<Argument> mArgs;
};
-
-#endif // __CHIPTOOL_COMMAND_H__
diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h
index bc2209d..94a0329 100644
--- a/examples/chip-tool/commands/common/Commands.h
+++ b/examples/chip-tool/commands/common/Commands.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_COMMANDS_H__
-#define __CHIPTOOL_COMMANDS_H__
+#pragma once
#include "Command.h"
#include <map>
@@ -43,5 +42,3 @@
std::map<const char *, std::vector<std::unique_ptr<Command>>> clusters;
};
-
-#endif // __CHIPTOOL_COMMANDS_H__
diff --git a/examples/chip-tool/commands/common/EchoCommand.h b/examples/chip-tool/commands/common/EchoCommand.h
index 9a8c8f6..97a2adb 100644
--- a/examples/chip-tool/commands/common/EchoCommand.h
+++ b/examples/chip-tool/commands/common/EchoCommand.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_COMMAND_ECHO_H__
-#define __CHIPTOOL_COMMAND_ECHO_H__
+#pragma once
#include "NetworkCommand.h"
@@ -40,5 +39,3 @@
ChipDeviceController * mController = nullptr;
};
-
-#endif // __CHIPTOOL_COMMAND_ECHO_H__
diff --git a/examples/chip-tool/commands/common/ModelCommand.h b/examples/chip-tool/commands/common/ModelCommand.h
index ff7d0db..efc4f78 100644
--- a/examples/chip-tool/commands/common/ModelCommand.h
+++ b/examples/chip-tool/commands/common/ModelCommand.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_MODELCOMMAND_H__
-#define __CHIPTOOL_MODELCOMMAND_H__
+#pragma once
#include "NetworkCommand.h"
@@ -76,5 +75,3 @@
uint32_t mEndPointId;
uint16_t mClusterId;
};
-
-#endif // __CHIPTOOL_MODELCOMMAND_H__
diff --git a/examples/chip-tool/commands/common/NetworkCommand.h b/examples/chip-tool/commands/common/NetworkCommand.h
index e4efd5e..b6f1119 100644
--- a/examples/chip-tool/commands/common/NetworkCommand.h
+++ b/examples/chip-tool/commands/common/NetworkCommand.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_IPCOMMAND_H__
-#define __CHIPTOOL_IPCOMMAND_H__
+#pragma once
#include "Command.h"
@@ -65,5 +64,3 @@
uint32_t mDiscriminator;
uint32_t mSetupPINCode;
};
-
-#endif //__CHIPTOOL_IPCOMMAND_H__
diff --git a/examples/chip-tool/commands/echo/Commands.h b/examples/chip-tool/commands/echo/Commands.h
index 7cdd623..ce1647e 100644
--- a/examples/chip-tool/commands/echo/Commands.h
+++ b/examples/chip-tool/commands/echo/Commands.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef __CHIPTOOL_ECHO_COMMANDS_H__
-#define __CHIPTOOL_ECHO_COMMANDS_H__
+#pragma once
#include "../common/EchoCommand.h"
@@ -44,5 +43,3 @@
commands.Register(clusterName, clusterCommands);
}
-
-#endif // __CHIPTOOL_ECHO_COMMANDS_H__
diff --git a/examples/common/chip-app-server/include/DataModelHandler.h b/examples/common/chip-app-server/include/DataModelHandler.h
index 08b60dd..61493a7 100644
--- a/examples/common/chip-app-server/include/DataModelHandler.h
+++ b/examples/common/chip-app-server/include/DataModelHandler.h
@@ -20,8 +20,7 @@
* This file defines the API for the handler for data model messages.
*/
-#ifndef DATA_MODEL_HANDLER_H
-#define DATA_MODEL_HANDLER_H
+#pragma once
#include <system/SystemPacketBuffer.h>
#include <transport/SecureSessionMgr.h>
@@ -39,5 +38,3 @@
chip::SecureSessionMgrBase * mgr);
void InitDataModelHandler();
}
-
-#endif // DATA_MODEL_HANDLER_H
diff --git a/examples/common/chip-app-server/include/QRCodeUtil.h b/examples/common/chip-app-server/include/QRCodeUtil.h
index da51d67..254b888 100644
--- a/examples/common/chip-app-server/include/QRCodeUtil.h
+++ b/examples/common/chip-app-server/include/QRCodeUtil.h
@@ -15,11 +15,8 @@
* limitations under the License.
*/
-#ifndef QR_CODE_UTIL_H
-#define QR_CODE_UTIL_H
+#pragma once
#include <setup_payload/SetupPayload.h>
void PrintQRCode(chip::RendezvousInformationFlags rendezvousFlags);
-
-#endif // QR_CODE_UTIL_H
diff --git a/examples/common/chip-app-server/include/RendezvousServer.h b/examples/common/chip-app-server/include/RendezvousServer.h
index d6831e2..ff943be 100644
--- a/examples/common/chip-app-server/include/RendezvousServer.h
+++ b/examples/common/chip-app-server/include/RendezvousServer.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef CHIP_APP_SERVER_RENDEZVOUS_DELEGATE_H_
-#define CHIP_APP_SERVER_RENDEZVOUS_DELEGATE_H_
+#pragma once
#include <platform/CHIPDeviceLayer.h>
#include <transport/RendezvousSession.h>
@@ -40,5 +39,3 @@
};
} // namespace chip
-
-#endif // CHIP_APP_SERVER_RENDEZVOUS_DELEGATE_H_
diff --git a/examples/common/chip-app-server/include/Server.h b/examples/common/chip-app-server/include/Server.h
index 46bf9f1..1034a69 100644
--- a/examples/common/chip-app-server/include/Server.h
+++ b/examples/common/chip-app-server/include/Server.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef CHIP_APP_SERVER_SERVER_H
-#define CHIP_APP_SERVER_SERVER_H
+#pragma once
#include <inet/IPAddress.h>
#include <inet/InetLayer.h>
@@ -33,5 +32,3 @@
* @param [in] sessions The demo's session manager.
*/
void InitServer();
-
-#endif // CHIP_APP_SERVER_SERVER_H
diff --git a/examples/common/screen-framework/include/Display.h b/examples/common/screen-framework/include/Display.h
index 73df406..4084812 100644
--- a/examples/common/screen-framework/include/Display.h
+++ b/examples/common/screen-framework/include/Display.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef DISPLAY_H
-#define DISPLAY_H
+#pragma once
#include "esp_system.h"
@@ -98,5 +97,3 @@
extern bool WakeDisplay();
#endif // #if CONFIG_HAVE_DISPLAY
-
-#endif // DISPLAY_H
diff --git a/examples/common/screen-framework/include/ListScreen.h b/examples/common/screen-framework/include/ListScreen.h
index c945382..49e46ca 100644
--- a/examples/common/screen-framework/include/ListScreen.h
+++ b/examples/common/screen-framework/include/ListScreen.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef LIST_SCREEN_H
-#define LIST_SCREEN_H
+#pragma once
#include "Screen.h"
#include "ScreenManager.h"
@@ -124,5 +123,3 @@
};
#endif // CONFIG_HAVE_DISPLAY
-
-#endif // LIST_SCREEN_H
diff --git a/examples/common/screen-framework/include/Screen.h b/examples/common/screen-framework/include/Screen.h
index ae51884..58792ff 100644
--- a/examples/common/screen-framework/include/Screen.h
+++ b/examples/common/screen-framework/include/Screen.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef SCREEN_H
-#define SCREEN_H
+#pragma once
#include "Display.h"
@@ -66,5 +65,3 @@
};
#endif // CONFIG_HAVE_DISPLAY
-
-#endif // SCREEN_H
diff --git a/examples/common/screen-framework/include/ScreenManager.h b/examples/common/screen-framework/include/ScreenManager.h
index 301d19d..4269252 100644
--- a/examples/common/screen-framework/include/ScreenManager.h
+++ b/examples/common/screen-framework/include/ScreenManager.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef SCREEN_MANAGER_H
-#define SCREEN_MANAGER_H
+#pragma once
#include "Display.h"
#include "Screen.h"
@@ -63,5 +62,3 @@
};
#endif // CONFIG_HAVE_DISPLAY
-
-#endif // SCREEN_MANAGER_H
diff --git a/examples/lighting-app/efr32/include/AppConfig.h b/examples/lighting-app/efr32/include/AppConfig.h
index 1186ff9..fb55c83 100644
--- a/examples/lighting-app/efr32/include/AppConfig.h
+++ b/examples/lighting-app/efr32/include/AppConfig.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ---- Lighting Example App Config ----
@@ -67,4 +66,3 @@
#ifdef __cplusplus
}
#endif
-#endif // APP_CONFIG_H
diff --git a/examples/lighting-app/efr32/include/AppEvent.h b/examples/lighting-app/efr32/include/AppEvent.h
index 54d51aa..5b06f6f 100644
--- a/examples/lighting-app/efr32/include/AppEvent.h
+++ b/examples/lighting-app/efr32/include/AppEvent.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
struct AppEvent;
typedef void (*EventHandler)(AppEvent *);
@@ -55,5 +54,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lighting-app/efr32/include/AppTask.h b/examples/lighting-app/efr32/include/AppTask.h
index e7878c9..6440581 100644
--- a/examples/lighting-app/efr32/include/AppTask.h
+++ b/examples/lighting-app/efr32/include/AppTask.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -85,5 +84,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lighting-app/efr32/include/ButtonHandler.h b/examples/lighting-app/efr32/include/ButtonHandler.h
index d8f644e..4ddc155 100644
--- a/examples/lighting-app/efr32/include/ButtonHandler.h
+++ b/examples/lighting-app/efr32/include/ButtonHandler.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef BUTTON_HANDLER_H
-#define BUTTON_HANDLER_H
+#pragma once
#include <stdint.h>
@@ -36,5 +35,3 @@
static void EventHelper(uint8_t btnIdx, bool isrContext);
static void TimerCallback(TimerHandle_t xTimer);
};
-
-#endif // BUTTON_HANDLER_H
diff --git a/examples/lighting-app/efr32/include/CHIPProjectConfig.h b/examples/lighting-app/efr32/include/CHIPProjectConfig.h
index feeb392..ff2283a 100644
--- a/examples/lighting-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/efr32/include/CHIPProjectConfig.h
@@ -26,8 +26,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
/**
* CHIP_DEVICE_CONFIG_ENABLE_TEST_DEVICE_IDENTITY
@@ -122,5 +121,3 @@
* A size, in bytes, of the individual debug event logging buffer.
*/
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lighting-app/efr32/include/FreeRTOSConfig.h b/examples/lighting-app/efr32/include/FreeRTOSConfig.h
index 0db00c7..6346f98 100644
--- a/examples/lighting-app/efr32/include/FreeRTOSConfig.h
+++ b/examples/lighting-app/efr32/include/FreeRTOSConfig.h
@@ -97,8 +97,7 @@
1 tab == 4 spaces!
*/
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -284,4 +283,3 @@
#ifdef __cplusplus
}
#endif
-#endif /* FREERTOS_CONFIG_H */
diff --git a/examples/lighting-app/efr32/include/LightingManager.h b/examples/lighting-app/efr32/include/LightingManager.h
index 8dfa357..c53e2bf 100644
--- a/examples/lighting-app/efr32/include/LightingManager.h
+++ b/examples/lighting-app/efr32/include/LightingManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LIGHT_MANAGER_H
-#define LIGHT_MANAGER_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -82,5 +81,3 @@
{
return LightingManager::sLight;
}
-
-#endif // LIGHT_MANAGER_H
diff --git a/examples/lighting-app/efr32/include/board_features.h b/examples/lighting-app/efr32/include/board_features.h
index 7157673..e1ccb84 100644
--- a/examples/lighting-app/efr32/include/board_features.h
+++ b/examples/lighting-app/efr32/include/board_features.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef BOARD_FEATURES_H
-#define BOARD_FEATURES_H
+#pragma once
// Top level macros
#define SILABS_AF_DEVICE_NAME "lighting-example"
@@ -248,5 +247,3 @@
// #define FEATURE_EFP
// #define FEATURE_BOARD_DETECTED
#endif
-
-#endif /* BOARD_FEATURES_H */
diff --git a/examples/lighting-app/efr32/include/hal-config-app-common.h b/examples/lighting-app/efr32/include/hal-config-app-common.h
index 91fcba4..b19a615 100644
--- a/examples/lighting-app/efr32/include/hal-config-app-common.h
+++ b/examples/lighting-app/efr32/include/hal-config-app-common.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef HAL_CONFIG_APP_COMMON_H
-#define HAL_CONFIG_APP_COMMON_H
+#pragma once
#include "em_device.h"
#include "hal-config-types.h"
@@ -120,5 +119,3 @@
#define BSP_EXP_USART_TX_LOC BSP_USART0_TX_LOC
#endif // FEATURE_EXP_HEADER_USART3
-
-#endif /* HAL_CONFIG_APP_COMMON_H */
diff --git a/examples/lighting-app/linux/include/LightingManager.h b/examples/lighting-app/linux/include/LightingManager.h
index 95f6bd5..c677577 100644
--- a/examples/lighting-app/linux/include/LightingManager.h
+++ b/examples/lighting-app/linux/include/LightingManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LIGHTING_MANAGER_H
-#define LIGHTING_MANAGER_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -66,5 +65,3 @@
{
return LightingManager::sLight;
}
-
-#endif // LIGHTING_MANAGER_H
diff --git a/examples/lighting-app/nrf5/main/include/AppEvent.h b/examples/lighting-app/nrf5/main/include/AppEvent.h
index 5ebcbfa..bf33a34 100644
--- a/examples/lighting-app/nrf5/main/include/AppEvent.h
+++ b/examples/lighting-app/nrf5/main/include/AppEvent.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
struct AppEvent;
typedef void (*EventHandler)(AppEvent *);
@@ -58,5 +57,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lighting-app/nrf5/main/include/AppTask.h b/examples/lighting-app/nrf5/main/include/AppTask.h
index db088d7..3141b26 100644
--- a/examples/lighting-app/nrf5/main/include/AppTask.h
+++ b/examples/lighting-app/nrf5/main/include/AppTask.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -79,5 +78,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lighting-app/nrf5/main/include/LightingCLI.h b/examples/lighting-app/nrf5/main/include/LightingCLI.h
index a807e88..f464726 100644
--- a/examples/lighting-app/nrf5/main/include/LightingCLI.h
+++ b/examples/lighting-app/nrf5/main/include/LightingCLI.h
@@ -1,6 +1,3 @@
-#ifndef LIGHTINGCLI_H
-#define LIGHTINGCLI_H
+#pragma once
int StartShellTask();
-
-#endif // LIGHTINGCLI_H
diff --git a/examples/lighting-app/nrf5/main/include/LightingManager.h b/examples/lighting-app/nrf5/main/include/LightingManager.h
index b92410d..6100e5a 100644
--- a/examples/lighting-app/nrf5/main/include/LightingManager.h
+++ b/examples/lighting-app/nrf5/main/include/LightingManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LIGHTING_MANAGER_H
-#define LIGHTING_MANAGER_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -68,5 +67,3 @@
{
return LightingManager::sLight;
}
-
-#endif // LIGHTING_MANAGER_H
diff --git a/examples/lighting-app/nrf5/main/include/app_config.h b/examples/lighting-app/nrf5/main/include/app_config.h
index f0d4a47..7534841 100644
--- a/examples/lighting-app/nrf5/main/include/app_config.h
+++ b/examples/lighting-app/nrf5/main/include/app_config.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ----- Memory Config -----
@@ -140,5 +139,3 @@
// ---- Thread Polling Config ----
#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100
#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000
-
-#endif // APP_CONFIG_H
diff --git a/examples/lighting-app/nrfconnect/main/include/AppConfig.h b/examples/lighting-app/nrfconnect/main/include/AppConfig.h
index 110d0fa..139592b 100644
--- a/examples/lighting-app/nrfconnect/main/include/AppConfig.h
+++ b/examples/lighting-app/nrfconnect/main/include/AppConfig.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ---- Lighting Example App Config ----
@@ -34,5 +33,3 @@
// Time it takes in ms for the simulated actuator to move from one state to another.
#define ACTUATOR_MOVEMENT_PERIOS_MS 2000
-
-#endif // APP_CONFIG_H
diff --git a/examples/lighting-app/nrfconnect/main/include/AppEvent.h b/examples/lighting-app/nrfconnect/main/include/AppEvent.h
index 5662d4b..319a680 100644
--- a/examples/lighting-app/nrfconnect/main/include/AppEvent.h
+++ b/examples/lighting-app/nrfconnect/main/include/AppEvent.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
#include <cstdint>
@@ -55,5 +54,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lighting-app/nrfconnect/main/include/AppTask.h b/examples/lighting-app/nrfconnect/main/include/AppTask.h
index f7c0065..fb382d7 100644
--- a/examples/lighting-app/nrfconnect/main/include/AppTask.h
+++ b/examples/lighting-app/nrfconnect/main/include/AppTask.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include "AppEvent.h"
#include "LightingManager.h"
@@ -75,5 +74,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
index 082fe0d..4908f99 100644
--- a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -25,11 +25,8 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
// Use a default pairing code if one hasn't been provisioned in flash.
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 12345678
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lighting-app/nrfconnect/main/include/LightingManager.h b/examples/lighting-app/nrfconnect/main/include/LightingManager.h
index 365fc9d..ed4c098 100644
--- a/examples/lighting-app/nrfconnect/main/include/LightingManager.h
+++ b/examples/lighting-app/nrfconnect/main/include/LightingManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LIGHTING_MANAGER_H
-#define LIGHTING_MANAGER_H
+#pragma once
#include "AppEvent.h"
@@ -66,5 +65,3 @@
{
return LightingManager::sLight;
}
-
-#endif // LIGHTING_MANAGER_H
diff --git a/examples/lock-app/efr32/include/AppConfig.h b/examples/lock-app/efr32/include/AppConfig.h
index 05ec09a..140a47b 100644
--- a/examples/lock-app/efr32/include/AppConfig.h
+++ b/examples/lock-app/efr32/include/AppConfig.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ---- Lock Example App Config ----
@@ -67,4 +66,3 @@
#ifdef __cplusplus
}
#endif
-#endif // APP_CONFIG_H
diff --git a/examples/lock-app/efr32/include/AppEvent.h b/examples/lock-app/efr32/include/AppEvent.h
index 53ffbc1..6ccad90 100644
--- a/examples/lock-app/efr32/include/AppEvent.h
+++ b/examples/lock-app/efr32/include/AppEvent.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
struct AppEvent;
typedef void (*EventHandler)(AppEvent *);
@@ -55,5 +54,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lock-app/efr32/include/AppTask.h b/examples/lock-app/efr32/include/AppTask.h
index 025862e..0202032 100644
--- a/examples/lock-app/efr32/include/AppTask.h
+++ b/examples/lock-app/efr32/include/AppTask.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -86,5 +85,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lock-app/efr32/include/BoltLockManager.h b/examples/lock-app/efr32/include/BoltLockManager.h
index d6f4025..84466db 100644
--- a/examples/lock-app/efr32/include/BoltLockManager.h
+++ b/examples/lock-app/efr32/include/BoltLockManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LOCK_MANAGER_H
-#define LOCK_MANAGER_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -82,5 +81,3 @@
{
return BoltLockManager::sLock;
}
-
-#endif // LOCK_MANAGER_H
diff --git a/examples/lock-app/efr32/include/ButtonHandler.h b/examples/lock-app/efr32/include/ButtonHandler.h
index d8f644e..4ddc155 100644
--- a/examples/lock-app/efr32/include/ButtonHandler.h
+++ b/examples/lock-app/efr32/include/ButtonHandler.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef BUTTON_HANDLER_H
-#define BUTTON_HANDLER_H
+#pragma once
#include <stdint.h>
@@ -36,5 +35,3 @@
static void EventHelper(uint8_t btnIdx, bool isrContext);
static void TimerCallback(TimerHandle_t xTimer);
};
-
-#endif // BUTTON_HANDLER_H
diff --git a/examples/lock-app/efr32/include/CHIPProjectConfig.h b/examples/lock-app/efr32/include/CHIPProjectConfig.h
index e3442d6..ad0216e 100644
--- a/examples/lock-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/lock-app/efr32/include/CHIPProjectConfig.h
@@ -26,8 +26,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
/**
* CHIP_DEVICE_CONFIG_ENABLE_TEST_DEVICE_IDENTITY
@@ -122,5 +121,3 @@
* A size, in bytes, of the individual debug event logging buffer.
*/
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lock-app/efr32/include/FreeRTOSConfig.h b/examples/lock-app/efr32/include/FreeRTOSConfig.h
index 0db00c7..6346f98 100644
--- a/examples/lock-app/efr32/include/FreeRTOSConfig.h
+++ b/examples/lock-app/efr32/include/FreeRTOSConfig.h
@@ -97,8 +97,7 @@
1 tab == 4 spaces!
*/
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -284,4 +283,3 @@
#ifdef __cplusplus
}
#endif
-#endif /* FREERTOS_CONFIG_H */
diff --git a/examples/lock-app/efr32/include/ble-configuration.h b/examples/lock-app/efr32/include/ble-configuration.h
index be77280..c405714 100644
--- a/examples/lock-app/efr32/include/ble-configuration.h
+++ b/examples/lock-app/efr32/include/ble-configuration.h
@@ -33,8 +33,7 @@
*
******************************************************************************/
-#ifndef __BLE_CONFIG__
-#define __BLE_CONFIG__
+#pragma once
// Top level macros
#define SILABS_AF_DEVICE_NAME "lock-example"
@@ -45,5 +44,3 @@
#undef EMBER_AF_BOARD_TYPE
#endif
#define EMBER_AF_BOARD_TYPE BOARD_ID
-
-#endif // __BLE_CONFIG__
diff --git a/examples/lock-app/efr32/include/board_features.h b/examples/lock-app/efr32/include/board_features.h
index bf2f91c..68d64b1 100644
--- a/examples/lock-app/efr32/include/board_features.h
+++ b/examples/lock-app/efr32/include/board_features.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef BOARD_FEATURES_H
-#define BOARD_FEATURES_H
+#pragma once
#include "ble-configuration.h"
@@ -240,5 +239,3 @@
// #define FEATURE_EFP
// #define FEATURE_BOARD_DETECTED
#endif
-
-#endif /* BOARD_FEATURES_H */
diff --git a/examples/lock-app/efr32/include/hal-config-app-common.h b/examples/lock-app/efr32/include/hal-config-app-common.h
index 91fcba4..b19a615 100644
--- a/examples/lock-app/efr32/include/hal-config-app-common.h
+++ b/examples/lock-app/efr32/include/hal-config-app-common.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef HAL_CONFIG_APP_COMMON_H
-#define HAL_CONFIG_APP_COMMON_H
+#pragma once
#include "em_device.h"
#include "hal-config-types.h"
@@ -120,5 +119,3 @@
#define BSP_EXP_USART_TX_LOC BSP_USART0_TX_LOC
#endif // FEATURE_EXP_HEADER_USART3
-
-#endif /* HAL_CONFIG_APP_COMMON_H */
diff --git a/examples/lock-app/k32w/main/include/AppEvent.h b/examples/lock-app/k32w/main/include/AppEvent.h
index 3bc24e0..ca17ae6 100644
--- a/examples/lock-app/k32w/main/include/AppEvent.h
+++ b/examples/lock-app/k32w/main/include/AppEvent.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
struct AppEvent;
typedef void (*EventHandler)(AppEvent *);
@@ -54,5 +53,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lock-app/k32w/main/include/AppTask.h b/examples/lock-app/k32w/main/include/AppTask.h
index c03f68d..c700271 100644
--- a/examples/lock-app/k32w/main/include/AppTask.h
+++ b/examples/lock-app/k32w/main/include/AppTask.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -85,5 +84,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lock-app/k32w/main/include/BoltLockManager.h b/examples/lock-app/k32w/main/include/BoltLockManager.h
index b26bc71..1ad332b 100644
--- a/examples/lock-app/k32w/main/include/BoltLockManager.h
+++ b/examples/lock-app/k32w/main/include/BoltLockManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LOCK_MANAGER_H
-#define LOCK_MANAGER_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -82,5 +81,3 @@
{
return BoltLockManager::sLock;
}
-
-#endif // LOCK_MANAGER_H
diff --git a/examples/lock-app/k32w/main/include/CHIPProjectConfig.h b/examples/lock-app/k32w/main/include/CHIPProjectConfig.h
index 152c25f..b4f9da0 100644
--- a/examples/lock-app/k32w/main/include/CHIPProjectConfig.h
+++ b/examples/lock-app/k32w/main/include/CHIPProjectConfig.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
#if BUILD_RELEASE // release build
@@ -158,5 +157,3 @@
#else
#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
#endif // BUILD_RELEASE
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lock-app/k32w/main/include/FreeRTOSConfig.h b/examples/lock-app/k32w/main/include/FreeRTOSConfig.h
index f591610..0ea6cfe 100644
--- a/examples/lock-app/k32w/main/include/FreeRTOSConfig.h
+++ b/examples/lock-app/k32w/main/include/FreeRTOSConfig.h
@@ -25,8 +25,7 @@
* 1 tab == 4 spaces!
*/
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
+#pragma once
/*-----------------------------------------------------------
* Application specific definitions.
@@ -160,5 +159,3 @@
#define vPortSVCHandler SVC_Handler
#define xPortPendSVHandler PendSV_Handler
#define xPortSysTickHandler SysTick_Handler
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/examples/lock-app/k32w/main/include/FreeRtosMbedtlsMutex.h b/examples/lock-app/k32w/main/include/FreeRtosMbedtlsMutex.h
index 2fcdf93..a27f72d 100644
--- a/examples/lock-app/k32w/main/include/FreeRtosMbedtlsMutex.h
+++ b/examples/lock-app/k32w/main/include/FreeRtosMbedtlsMutex.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef FREERTOS_MBEDTLS_MUTEX_H__
-#define FREERTOS_MBEDTLS_MUTEX_H__
+#pragma once
typedef void * mbedtls_threading_mutex_t;
@@ -41,5 +40,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif /* FREERTOS_MBEDTLS_MUTEX_H__ */
diff --git a/examples/lock-app/k32w/main/include/LEDWidget.h b/examples/lock-app/k32w/main/include/LEDWidget.h
index f69f482..7bace64 100644
--- a/examples/lock-app/k32w/main/include/LEDWidget.h
+++ b/examples/lock-app/k32w/main/include/LEDWidget.h
@@ -18,8 +18,7 @@
#include "LED.h"
-#ifndef LED_WIDGET_H
-#define LED_WIDGET_H
+#pragma once
class LEDWidget
{
@@ -40,5 +39,3 @@
void DoSet(bool state);
};
-
-#endif // LED_WIDGET_H
diff --git a/examples/lock-app/k32w/main/include/OpenThreadConfig.h b/examples/lock-app/k32w/main/include/OpenThreadConfig.h
index d5dab3c..f3c3fa5 100644
--- a/examples/lock-app/k32w/main/include/OpenThreadConfig.h
+++ b/examples/lock-app/k32w/main/include/OpenThreadConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef OPENTHREAD_PLATFORM_CONFIG_H
-#define OPENTHREAD_PLATFORM_CONFIG_H
+#pragma once
// Disable the Nxp-supplied OpenThread logging facilities and use
// the facilities provided by the OpenWeave Device Layer (see
@@ -52,5 +51,3 @@
// it cannot use "openthread" in the path to the included file.
//
#include "openthread-core-k32w061-config.h"
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/examples/lock-app/k32w/main/include/app_config.h b/examples/lock-app/k32w/main/include/app_config.h
index 50d86e0..07a8ab5 100644
--- a/examples/lock-app/k32w/main/include/app_config.h
+++ b/examples/lock-app/k32w/main/include/app_config.h
@@ -18,8 +18,7 @@
#include "LED.h"
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ---- Lock Example App Config ----
@@ -51,5 +50,3 @@
#define K32W_LOG(...) k32wLog(__VA_ARGS__);
void k32wLog(const char * aFormat, ...);
-
-#endif // APP_CONFIG_H
diff --git a/examples/lock-app/nrf5/main/include/AppEvent.h b/examples/lock-app/nrf5/main/include/AppEvent.h
index c678192..ebcdfd9 100644
--- a/examples/lock-app/nrf5/main/include/AppEvent.h
+++ b/examples/lock-app/nrf5/main/include/AppEvent.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
#include <stdint.h>
@@ -56,5 +55,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lock-app/nrf5/main/include/AppTask.h b/examples/lock-app/nrf5/main/include/AppTask.h
index 27c8e0b..a361333 100644
--- a/examples/lock-app/nrf5/main/include/AppTask.h
+++ b/examples/lock-app/nrf5/main/include/AppTask.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -79,5 +78,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lock-app/nrf5/main/include/BoltLockManager.h b/examples/lock-app/nrf5/main/include/BoltLockManager.h
index 08b5aca..f7e419b 100644
--- a/examples/lock-app/nrf5/main/include/BoltLockManager.h
+++ b/examples/lock-app/nrf5/main/include/BoltLockManager.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LOCK_MANAGER_H
-#define LOCK_MANAGER_H
+#pragma once
#include <AppEvent.h>
#include <stdbool.h>
@@ -78,5 +77,3 @@
{
return BoltLockManager::sLock;
}
-
-#endif // LOCK_MANAGER_H
diff --git a/examples/lock-app/nrf5/main/include/app_config.h b/examples/lock-app/nrf5/main/include/app_config.h
index b9c17c8..d1edec4 100644
--- a/examples/lock-app/nrf5/main/include/app_config.h
+++ b/examples/lock-app/nrf5/main/include/app_config.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ----- Memory Config -----
@@ -141,5 +140,3 @@
// ---- Thread Polling Config ----
#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100
#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000
-
-#endif // APP_CONFIG_H
diff --git a/examples/lock-app/nrfconnect/main/include/AppConfig.h b/examples/lock-app/nrfconnect/main/include/AppConfig.h
index 270d55e..a278d4e 100644
--- a/examples/lock-app/nrfconnect/main/include/AppConfig.h
+++ b/examples/lock-app/nrfconnect/main/include/AppConfig.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ---- Lock Example App Config ----
@@ -33,5 +32,3 @@
// Time it takes in ms for the simulated actuator to move from one state to another.
#define ACTUATOR_MOVEMENT_PERIOS_MS 2000
-
-#endif // APP_CONFIG_H
diff --git a/examples/lock-app/nrfconnect/main/include/AppEvent.h b/examples/lock-app/nrfconnect/main/include/AppEvent.h
index 713e848..bf20357 100644
--- a/examples/lock-app/nrfconnect/main/include/AppEvent.h
+++ b/examples/lock-app/nrfconnect/main/include/AppEvent.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
+#pragma once
#include <cstdint>
@@ -56,5 +55,3 @@
EventHandler Handler;
};
-
-#endif // APP_EVENT_H
diff --git a/examples/lock-app/nrfconnect/main/include/AppTask.h b/examples/lock-app/nrfconnect/main/include/AppTask.h
index 6c85259..db10126 100644
--- a/examples/lock-app/nrfconnect/main/include/AppTask.h
+++ b/examples/lock-app/nrfconnect/main/include/AppTask.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef APP_TASK_H
-#define APP_TASK_H
+#pragma once
#include "AppEvent.h"
#include "BoltLockManager.h"
@@ -74,5 +73,3 @@
{
return AppTask::sAppTask;
}
-
-#endif // APP_TASK_H
diff --git a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
index 96838c8..0500bfb 100644
--- a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
+++ b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef LOCK_MANAGER_H
-#define LOCK_MANAGER_H
+#pragma once
#include <cstdint>
@@ -81,5 +80,3 @@
{
return BoltLockManager::sLock;
}
-
-#endif // LOCK_MANAGER_H
diff --git a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
index 082fe0d..4908f99 100644
--- a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
+++ b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -25,11 +25,8 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
// Use a default pairing code if one hasn't been provisioned in flash.
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 12345678
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lock-app/qpg6100/include/CHIPProjectConfig.h b/examples/lock-app/qpg6100/include/CHIPProjectConfig.h
index 3ee62c9..0f429ff 100644
--- a/examples/lock-app/qpg6100/include/CHIPProjectConfig.h
+++ b/examples/lock-app/qpg6100/include/CHIPProjectConfig.h
@@ -26,8 +26,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
/**
* CHIP_DEVICE_CONFIG_ENABLE_TEST_DEVICE_IDENTITY
@@ -121,5 +120,3 @@
* A size, in bytes, of the individual debug event logging buffer.
*/
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/pigweed-app/nrf5/main/include/app_config.h b/examples/pigweed-app/nrf5/main/include/app_config.h
index d632d27..8720b7f 100644
--- a/examples/pigweed-app/nrf5/main/include/app_config.h
+++ b/examples/pigweed-app/nrf5/main/include/app_config.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ----- Memory Config -----
@@ -142,5 +141,3 @@
// ---- Thread Polling Config ----
#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100
#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000
-
-#endif // APP_CONFIG_H
diff --git a/examples/platform/efr32/LEDWidget.h b/examples/platform/efr32/LEDWidget.h
index 96f1a88..be2185a 100644
--- a/examples/platform/efr32/LEDWidget.h
+++ b/examples/platform/efr32/LEDWidget.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef LED_WIDGET_H
-#define LED_WIDGET_H
+#pragma once
#include <stdint.h>
@@ -42,5 +41,3 @@
void DoSet(bool state);
};
-
-#endif // LED_WIDGET_H
diff --git a/examples/platform/efr32/Service.h b/examples/platform/efr32/Service.h
index 4cd2ea8..1426ec6 100644
--- a/examples/platform/efr32/Service.h
+++ b/examples/platform/efr32/Service.h
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-#ifndef EFR32_SERVICE_H
-#define EFR32_SERVICE_H
+#pragma once
void SetDeviceName(const char * newDeviceName);
void PublishService();
-
-#endif // EFR32_SERVICE_H
diff --git a/examples/platform/efr32/board_config.h b/examples/platform/efr32/board_config.h
index b5d566c..b832acf 100644
--- a/examples/platform/efr32/board_config.h
+++ b/examples/platform/efr32/board_config.h
@@ -32,8 +32,7 @@
*
*/
-#ifndef __BOARD_CONFIG_H__
-#define __BOARD_CONFIG_H__
+#pragma once
/// Dev board suppports OQPSK modulation in 2.4GHz band.
#if (BRD4161A || BRD4163A || BRD4164A || BRD4166A || BRD4170A || BRD4304A || BRD4180A)
@@ -63,5 +62,3 @@
#ifndef RADIO_CONFIG_DMP_SUPPORT
#define RADIO_CONFIG_DMP_SUPPORT 0 /// Set to 1 to enable Dynamic Multi-Protocol support in radio.c
#endif
-
-#endif // __BOARD_CONFIG_H__
diff --git a/examples/platform/efr32/efr32mg12/BRD4163A/hal-config.h b/examples/platform/efr32/efr32mg12/BRD4163A/hal-config.h
index f6e7a0f..ec90905 100644
--- a/examples/platform/efr32/efr32mg12/BRD4163A/hal-config.h
+++ b/examples/platform/efr32/efr32mg12/BRD4163A/hal-config.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef HAL_CONFIG_H
-#define HAL_CONFIG_H
+#pragma once
#include "board_features.h"
#include "hal-config-app-common.h"
@@ -102,5 +101,3 @@
#define HAL_USART1_FREQUENCY (1000000UL)
#define HAL_VCOM_ENABLE (1)
-
-#endif /* HAL_CONFIG_H */
diff --git a/examples/platform/efr32/init_board.h b/examples/platform/efr32/init_board.h
index e8e7f8f..74581d4 100644
--- a/examples/platform/efr32/init_board.h
+++ b/examples/platform/efr32/init_board.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef INIT_BOARD_H
-#define INIT_BOARD_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -47,5 +46,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // INIT_BOARD_H
diff --git a/examples/platform/efr32/init_mcu.h b/examples/platform/efr32/init_mcu.h
index a30c61b..18f1bfe 100644
--- a/examples/platform/efr32/init_mcu.h
+++ b/examples/platform/efr32/init_mcu.h
@@ -32,8 +32,7 @@
*
******************************************************************************/
-#ifndef INIT_MCU_H
-#define INIT_MCU_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -69,5 +68,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // INIT_MCU_H
diff --git a/examples/platform/efr32/lcd.h b/examples/platform/efr32/lcd.h
index a2d0d9c..f91fca6 100644
--- a/examples/platform/efr32/lcd.h
+++ b/examples/platform/efr32/lcd.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef INIT_LCD_H
-#define INIT_LCD_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -34,5 +33,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // INIT_LCD_H
diff --git a/examples/platform/efr32/project_include/OpenThreadConfig.h b/examples/platform/efr32/project_include/OpenThreadConfig.h
index a1d8b22..4d5ed63 100644
--- a/examples/platform/efr32/project_include/OpenThreadConfig.h
+++ b/examples/platform/efr32/project_include/OpenThreadConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef OPENTHREAD_PLATFORM_CONFIG_H
-#define OPENTHREAD_PLATFORM_CONFIG_H
+#pragma once
#include <em_device.h>
@@ -54,5 +53,3 @@
// it cannot use "openthread" in the path to the included file.
//
#include "openthread-core-efr32-config.h"
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/examples/platform/nrf528xx/app/include/Service.h b/examples/platform/nrf528xx/app/include/Service.h
index 5406f4e..1426ec6 100644
--- a/examples/platform/nrf528xx/app/include/Service.h
+++ b/examples/platform/nrf528xx/app/include/Service.h
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-#ifndef NRF5_COMMON_SERVICE_H
-#define NRF5_COMMON_SERVICE_H
+#pragma once
void SetDeviceName(const char * newDeviceName);
void PublishService();
-
-#endif // NRF5_COMMON_SERVICE_H
diff --git a/examples/platform/nrf528xx/app/include/chipinit.h b/examples/platform/nrf528xx/app/include/chipinit.h
index 0f29b72..446d8fe 100644
--- a/examples/platform/nrf528xx/app/include/chipinit.h
+++ b/examples/platform/nrf528xx/app/include/chipinit.h
@@ -1,8 +1,5 @@
-#ifndef NRF5_CHIPINIT_H
-#define NRF5_CHIPINIT_H
+#pragma once
#include "sdk_common.h"
ret_code_t ChipInit();
-
-#endif // NRF5_CHIPINIT_H
diff --git a/examples/platform/nrf528xx/app/project_include/CHIPProjectConfig.h b/examples/platform/nrf528xx/app/project_include/CHIPProjectConfig.h
index 19e2958..ea0c8a8 100644
--- a/examples/platform/nrf528xx/app/project_include/CHIPProjectConfig.h
+++ b/examples/platform/nrf528xx/app/project_include/CHIPProjectConfig.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
#if !BUILD_RELEASE // development build
@@ -138,5 +137,3 @@
#else
#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
#endif // BUILD_RELEASE
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/platform/nrf528xx/app/project_include/FreeRTOSConfig.h b/examples/platform/nrf528xx/app/project_include/FreeRTOSConfig.h
index c083c74..93ee984 100644
--- a/examples/platform/nrf528xx/app/project_include/FreeRTOSConfig.h
+++ b/examples/platform/nrf528xx/app/project_include/FreeRTOSConfig.h
@@ -43,8 +43,7 @@
* 1 tab == 4 spaces!
*/
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
+#pragma once
#include "sdk_config.h"
#ifdef SOFTDEVICE_PRESENT
@@ -215,5 +214,3 @@
* RTOS go out of sync but could be convenient for debugging.
*/
#define configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG 0
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/examples/platform/nrf528xx/app/project_include/OpenThreadConfig.h b/examples/platform/nrf528xx/app/project_include/OpenThreadConfig.h
index a025a5f..8ec0b7d 100644
--- a/examples/platform/nrf528xx/app/project_include/OpenThreadConfig.h
+++ b/examples/platform/nrf528xx/app/project_include/OpenThreadConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef OPENTHREAD_PLATFORM_CONFIG_H
-#define OPENTHREAD_PLATFORM_CONFIG_H
+#pragma once
// Disable the Nordic-supplied OpenThread logging facilities and use
// the facilities provided by the CHIP Device Layer
@@ -57,5 +56,3 @@
// it cannot use "openthread" in the path to the included file.
//
#include "openthread-core-nrf52840-config.h"
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/examples/platform/nrf528xx/app/project_include/freertos_tasks_c_additions.h b/examples/platform/nrf528xx/app/project_include/freertos_tasks_c_additions.h
index 013ad14..33ce1e1 100644
--- a/examples/platform/nrf528xx/app/project_include/freertos_tasks_c_additions.h
+++ b/examples/platform/nrf528xx/app/project_include/freertos_tasks_c_additions.h
@@ -27,8 +27,7 @@
* configuration option.
*/
-#ifndef FREERTOS_TASKS_C_ADDITIONS_H
-#define FREERTOS_TASKS_C_ADDITIONS_H
+#pragma once
/*
* Version of the FreeRTOSDebugConfig structure
@@ -70,5 +69,3 @@
configMAX_PRIORITIES,
0 /* padding */
};
-
-#endif /* FREERTOS_TASKS_C_ADDITIONS_H */
diff --git a/examples/platform/nrf528xx/util/include/LEDWidget.h b/examples/platform/nrf528xx/util/include/LEDWidget.h
index e6f1abf..a719a12 100644
--- a/examples/platform/nrf528xx/util/include/LEDWidget.h
+++ b/examples/platform/nrf528xx/util/include/LEDWidget.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LED_WIDGET_H
-#define LED_WIDGET_H
+#pragma once
class LEDWidget
{
@@ -38,5 +37,3 @@
void DoSet(bool state);
};
-
-#endif // LED_WIDGET_H
diff --git a/examples/platform/nrfconnect/app/include/Service.h b/examples/platform/nrfconnect/app/include/Service.h
index 19fcdb8..c42c547 100644
--- a/examples/platform/nrfconnect/app/include/Service.h
+++ b/examples/platform/nrfconnect/app/include/Service.h
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-#ifndef NRFCONNECT_COMMON_SERVICE_H
-#define NRFCONNECT_COMMON_SERVICE_H
+#pragma once
void PublishService();
-
-#endif // NRFCONNECT_COMMON_SERVICE_H
diff --git a/examples/platform/nrfconnect/util/include/LEDWidget.h b/examples/platform/nrfconnect/util/include/LEDWidget.h
index 9cd9cfb..fd47227 100644
--- a/examples/platform/nrfconnect/util/include/LEDWidget.h
+++ b/examples/platform/nrfconnect/util/include/LEDWidget.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef LED_WIDGET_H
-#define LED_WIDGET_H
+#pragma once
#include <cstdint>
@@ -41,5 +40,3 @@
void DoSet(bool state);
};
-
-#endif // LED_WIDGET_H
diff --git a/examples/platform/nrfconnect/util/include/ThreadUtil.h b/examples/platform/nrfconnect/util/include/ThreadUtil.h
index d3154c7..37fa286 100644
--- a/examples/platform/nrfconnect/util/include/ThreadUtil.h
+++ b/examples/platform/nrfconnect/util/include/ThreadUtil.h
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-#ifndef THREAD_UTIL_H
-#define THREAD_UTIL_H
+#pragma once
void StartDefaultThreadNetwork(void);
-
-#endif // THREAD_UTIL_H
diff --git a/examples/platform/qpg6100/project_include/OpenThreadConfig.h b/examples/platform/qpg6100/project_include/OpenThreadConfig.h
index fe47295..3986354 100644
--- a/examples/platform/qpg6100/project_include/OpenThreadConfig.h
+++ b/examples/platform/qpg6100/project_include/OpenThreadConfig.h
@@ -26,8 +26,7 @@
// TODO - enable full OpenThread integration
// https://github.com/project-chip/connectedhomeip/issues/293
-#ifndef OPENTHREAD_PLATFORM_CONFIG_H
-#define OPENTHREAD_PLATFORM_CONFIG_H
+#pragma once
// Disable the Qorvo-supplied OpenThread logging facilities and use
// the facilities provided by the Device Layer (see
@@ -51,5 +50,3 @@
// it cannot use "openthread" in the path to the included file.
//
//#include "openthread-core-qpg6095-config.h"
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/examples/shell/nrf52/include/CHIPProjectConfig.h b/examples/shell/nrf52/include/CHIPProjectConfig.h
index b581d4b..c2acc9a 100644
--- a/examples/shell/nrf52/include/CHIPProjectConfig.h
+++ b/examples/shell/nrf52/include/CHIPProjectConfig.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
#if !BUILD_RELEASE // development build
@@ -141,5 +140,3 @@
// Enable support functions for parsing command-line arguments
#define CHIP_CONFIG_ENABLE_ARG_PARSER 1
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/shell/nrf52/include/app_config.h b/examples/shell/nrf52/include/app_config.h
index cec1fc6..872a97b 100644
--- a/examples/shell/nrf52/include/app_config.h
+++ b/examples/shell/nrf52/include/app_config.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
// ----- Memory Config -----
@@ -133,5 +132,3 @@
// ---- Thread Polling Config ----
#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100
#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000
-
-#endif // APP_CONFIG_H
diff --git a/examples/shell/nrfconnect/CHIPProjectConfig.h b/examples/shell/nrfconnect/CHIPProjectConfig.h
index d9f4586..31220b0 100644
--- a/examples/shell/nrfconnect/CHIPProjectConfig.h
+++ b/examples/shell/nrfconnect/CHIPProjectConfig.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
+#pragma once
// Use a default pairing code if one hasn't been provisioned in flash.
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 12345678
@@ -34,5 +33,3 @@
// Enable support functions for parsing command-line arguments
#define CHIP_CONFIG_ENABLE_ARG_PARSER 1
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/shell/shell_common/include/ChipShellCollection.h b/examples/shell/shell_common/include/ChipShellCollection.h
index 335ee75..3306a4c 100644
--- a/examples/shell/shell_common/include/ChipShellCollection.h
+++ b/examples/shell/shell_common/include/ChipShellCollection.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef EXAMPLES_SHELL_CHIP_SHELL_H
-#define EXAMPLES_SHELL_CHIP_SHELL_H
+#pragma once
extern "C" {
// A list of shell commands provided by ChipShell
@@ -26,5 +25,3 @@
void cmd_misc_init(void);
void cmd_otcli_init(void);
}
-
-#endif // EXAMPLES_SHELL_CHIP_SHELL_H
diff --git a/examples/wifi-echo/server/esp32/main/include/BluetoothWidget.h b/examples/wifi-echo/server/esp32/main/include/BluetoothWidget.h
index 4e11a7a..93b636e 100644
--- a/examples/wifi-echo/server/esp32/main/include/BluetoothWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/BluetoothWidget.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef _BLUETOOTH_WIDGET_H
-#define _BLUETOOTH_WIDGET_H
+#pragma once
#include "Display.h"
@@ -35,5 +34,3 @@
int mVLED;
bool mState;
};
-
-#endif // _BLUETOOTH_WIDGET_H
diff --git a/examples/wifi-echo/server/esp32/main/include/Button.h b/examples/wifi-echo/server/esp32/main/include/Button.h
index a81052e..15eeb8a 100644
--- a/examples/wifi-echo/server/esp32/main/include/Button.h
+++ b/examples/wifi-echo/server/esp32/main/include/Button.h
@@ -24,8 +24,7 @@
*
**/
-#ifndef BUTTON_H
-#define BUTTON_H
+#pragma once
#include "driver/gpio.h"
#include "esp_log.h"
@@ -112,5 +111,3 @@
{
return mPrevStateDur * portTICK_PERIOD_MS;
}
-
-#endif // BUTTON_H
diff --git a/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h b/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h
index e7ce83a..75a0573 100644
--- a/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h
+++ b/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h
@@ -24,8 +24,7 @@
* activities within the CHIP stack. This is a singleton object.
*/
-#ifndef CHIP_DEVICEMANAGER_H_
-#define CHIP_DEVICEMANAGER_H_
+#pragma once
#include <core/CHIPCore.h>
#include <core/CHIPError.h>
@@ -131,5 +130,3 @@
} // namespace DeviceManager
} // namespace chip
-
-#endif /* CHIP_DEVICEMANAGER_H_ */
diff --git a/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h b/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h
index 455f1c8..07a6a10 100644
--- a/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h
+++ b/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h
@@ -20,8 +20,7 @@
* This file defines the API for the handler for data model messages.
*/
-#ifndef DATA_MODEL_HANDLER_H
-#define DATA_MODEL_HANDLER_H
+#pragma once
namespace chip {
namespace System {
@@ -50,5 +49,3 @@
*/
void HandleDataModelMessage(const chip::PacketHeader & header, chip::System::PacketBuffer * buffer,
chip::SecureSessionMgrBase * mgr);
-
-#endif // DATA_MODEL_HANDLER_H
diff --git a/examples/wifi-echo/server/esp32/main/include/DeviceCallbacks.h b/examples/wifi-echo/server/esp32/main/include/DeviceCallbacks.h
index 26c020d..6930790 100644
--- a/examples/wifi-echo/server/esp32/main/include/DeviceCallbacks.h
+++ b/examples/wifi-echo/server/esp32/main/include/DeviceCallbacks.h
@@ -23,8 +23,7 @@
*
**/
-#ifndef DEVICE_CALLBACKS_H
-#define DEVICE_CALLBACKS_H
+#pragma once
#include "CHIPDeviceManager.h"
#include <app/util/af-types.h>
@@ -44,5 +43,3 @@
void OnOnOffPostAttributeChangeCallback(uint8_t endpointId, uint16_t attributeId, uint8_t * value);
void OnIdentifyPostAttributeChangeCallback(uint8_t endpointId, uint16_t attributeId, uint8_t * value);
};
-
-#endif // DEVICE_CALLBACKS_H
diff --git a/examples/wifi-echo/server/esp32/main/include/DeviceNetworkProvisioningDelegate.h b/examples/wifi-echo/server/esp32/main/include/DeviceNetworkProvisioningDelegate.h
index a3d5cc1..3f09d08 100644
--- a/examples/wifi-echo/server/esp32/main/include/DeviceNetworkProvisioningDelegate.h
+++ b/examples/wifi-echo/server/esp32/main/include/DeviceNetworkProvisioningDelegate.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef _DEVICE_NETWORK_PROVISIONING_DELEGATE_H_
-#define _DEVICE_NETWORK_PROVISIONING_DELEGATE_H_
+#pragma once
#include <core/CHIPError.h>
#include <transport/NetworkProvisioning.h>
@@ -35,5 +34,3 @@
*/
void ProvisionNetwork(const char * ssid, const char * passwd) override;
};
-
-#endif // _DEVICE_NETWORK_PROVISIONING_DELEGATE_H_
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index 6374887..340914c 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef LED_WIDGET_H
-#define LED_WIDGET_H
+#pragma once
#include "Display.h"
@@ -56,5 +55,3 @@
friend void ClearErrorState(TimerHandle_t);
};
-
-#endif // LED_WIDGET_H
diff --git a/examples/wifi-echo/server/esp32/main/include/QRCodeScreen.h b/examples/wifi-echo/server/esp32/main/include/QRCodeScreen.h
index 446118b..e24fcd8 100644
--- a/examples/wifi-echo/server/esp32/main/include/QRCodeScreen.h
+++ b/examples/wifi-echo/server/esp32/main/include/QRCodeScreen.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef QR_CODE_SCREEN_H
-#define QR_CODE_SCREEN_H
+#pragma once
#include "Screen.h"
#include "ScreenManager.h"
@@ -48,5 +47,3 @@
};
#endif // CONFIG_HAVE_DISPLAY
-
-#endif // QR_CODE_SCREEN_H
diff --git a/examples/wifi-echo/server/esp32/main/include/RendezvousDeviceDelegate.h b/examples/wifi-echo/server/esp32/main/include/RendezvousDeviceDelegate.h
index 56bc657..44f8d65 100644
--- a/examples/wifi-echo/server/esp32/main/include/RendezvousDeviceDelegate.h
+++ b/examples/wifi-echo/server/esp32/main/include/RendezvousDeviceDelegate.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef __RENDEZVOUSDEVICEDELEGATE_H__
-#define __RENDEZVOUSDEVICEDELEGATE_H__
+#pragma once
#include "DeviceNetworkProvisioningDelegate.h"
@@ -36,5 +35,3 @@
chip::RendezvousSession * mRendezvousSession;
ESP32NetworkProvisioningDelegate mDeviceNetworkProvisioningDelegate;
};
-
-#endif // __RENDEZVOUSDEVICEDELEGATE_H__
diff --git a/examples/wifi-echo/server/esp32/main/include/RendezvousMessageHandler.h b/examples/wifi-echo/server/esp32/main/include/RendezvousMessageHandler.h
index 7e5cd87..52ce3ad 100644
--- a/examples/wifi-echo/server/esp32/main/include/RendezvousMessageHandler.h
+++ b/examples/wifi-echo/server/esp32/main/include/RendezvousMessageHandler.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef _RENDEZVOUS_MESSAGE_HANDLER_H
-#define _RENDEZVOUS_MESSAGE_HANDLER_H
+#pragma once
#include <core/CHIPError.h>
#include <platform/CHIPDeviceLayer.h>
@@ -30,5 +29,3 @@
// - Some other error encountered processing a specific message type.
static CHIP_ERROR HandleMessageReceived(chip::System::PacketBuffer * buffer);
};
-
-#endif // _RENDEZVOUS_MESSAGE_HANDLER_H
diff --git a/examples/wifi-echo/server/esp32/main/include/WiFiWidget.h b/examples/wifi-echo/server/esp32/main/include/WiFiWidget.h
index c884a9b..986ab48 100644
--- a/examples/wifi-echo/server/esp32/main/include/WiFiWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/WiFiWidget.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef _WIFI_WIDGET_H
-#define _WIFI_WIDGET_H
+#pragma once
#include "Display.h"
@@ -35,5 +34,3 @@
int mVLED;
bool mState;
};
-
-#endif // _WIFI_WIDGET_H
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
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index 229a46e..0b09e3a 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -26,8 +26,7 @@
*
*/
-#ifndef __CHIPDEVICECONTROLLER_H
-#define __CHIPDEVICECONTROLLER_H
+#pragma once
#include <core/CHIPCore.h>
#include <core/CHIPTLV.h>
@@ -285,5 +284,3 @@
} // namespace DeviceController
} // namespace chip
-
-#endif // __CHIPDEVICECONTROLLER_H
diff --git a/src/controller/java/AndroidBleApplicationDelegate.h b/src/controller/java/AndroidBleApplicationDelegate.h
index f2e1582..9c6ddd5 100644
--- a/src/controller/java/AndroidBleApplicationDelegate.h
+++ b/src/controller/java/AndroidBleApplicationDelegate.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef ANDROID_BLE_APPLICATION_DELEGATE_H
-#define ANDROID_BLE_APPLICATION_DELEGATE_H
+#pragma once
#include <ble/BleApplicationDelegate.h>
@@ -34,5 +33,3 @@
void SetNotifyChipConnectionClosedCallback(NotifyChipConnectionClosedCallback cb);
};
-
-#endif /* ANDROID_BLE_APPLICATION_DELEGATE_H */
diff --git a/src/controller/java/AndroidBleConnectionDelegate.h b/src/controller/java/AndroidBleConnectionDelegate.h
index 4d7dc75..ae7d0d5 100644
--- a/src/controller/java/AndroidBleConnectionDelegate.h
+++ b/src/controller/java/AndroidBleConnectionDelegate.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef ANDROID_BLE_CONNECTION_DELEGATE_H
-#define ANDROID_BLE_CONNECTION_DELEGATE_H
+#pragma once
#include <ble/BleConnectionDelegate.h>
@@ -33,5 +32,3 @@
private:
NotifyNewConnectionAvailable newConnectionCb = nullptr;
};
-
-#endif // ANDROID_BLE_CONNECTION_DELEGATE_H
diff --git a/src/controller/java/AndroidBlePlatformDelegate.h b/src/controller/java/AndroidBlePlatformDelegate.h
index 8269490..ba3f436 100644
--- a/src/controller/java/AndroidBlePlatformDelegate.h
+++ b/src/controller/java/AndroidBlePlatformDelegate.h
@@ -16,8 +16,7 @@
*
*/
-#ifndef ANDROID_BLE_PLATFORM_DELEGATE_H
-#define ANDROID_BLE_PLATFORM_DELEGATE_H
+#pragma once
#include <ble/BlePlatformDelegate.h>
#include <system/SystemPacketBuffer.h>
@@ -62,5 +61,3 @@
void SetCloseConnectionCallback(CloseConnectionCallback cb);
void SetGetMTUCallback(GetMTUCallback cb);
};
-
-#endif // ANDROID_BLE_PLATFORM_DELEGATE_H
diff --git a/src/controller/java/CHIPProjectConfig.h b/src/controller/java/CHIPProjectConfig.h
index 1685b9c..43d4c20 100644
--- a/src/controller/java/CHIPProjectConfig.h
+++ b/src/controller/java/CHIPProjectConfig.h
@@ -23,8 +23,7 @@
* Project-specific configuration file for Android builds.
*
*/
-#ifndef CHIPPROJECTCONFIG_H
-#define CHIPPROJECTCONFIG_H
+#pragma once
// Enable use of an ephemeral UDP source port for locally initiated CHIP exchanges.
#define CHIP_CONFIG_ENABLE_EPHEMERAL_UDP_PORT 1
@@ -51,5 +50,3 @@
#define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
#define CHIP_CONFIG_MAX_SOFTWARE_VERSION_LENGTH 128
-
-#endif /* CHIPPROJECTCONFIG_H */
diff --git a/src/controller/python/ChipDeviceController-BleApplicationDelegate.h b/src/controller/python/ChipDeviceController-BleApplicationDelegate.h
index e5f5c21..fe8bfe9 100644
--- a/src/controller/python/ChipDeviceController-BleApplicationDelegate.h
+++ b/src/controller/python/ChipDeviceController-BleApplicationDelegate.h
@@ -16,8 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef DEVICEMANAGER_BLEAPPLICATIONDELEGATE_H_
-#define DEVICEMANAGER_BLEAPPLICATIONDELEGATE_H_
+#pragma once
#include <ble/BleApplicationDelegate.h>
@@ -25,5 +24,3 @@
{
void NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT connObj);
};
-
-#endif /* DEVICEMANAGER_BLEAPPLICATIONDELEGATE_H_ */
diff --git a/src/controller/python/ChipDeviceController-BlePlatformDelegate.h b/src/controller/python/ChipDeviceController-BlePlatformDelegate.h
index f2d89ce..5703fef 100644
--- a/src/controller/python/ChipDeviceController-BlePlatformDelegate.h
+++ b/src/controller/python/ChipDeviceController-BlePlatformDelegate.h
@@ -17,8 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef DEVICEMANAGER_BLEPLATFORMDELEGATE_H_
-#define DEVICEMANAGER_BLEPLATFORMDELEGATE_H_
+#pragma once
#include <ble/BleLayer.h>
#include <ble/BlePlatformDelegate.h>
@@ -60,5 +59,3 @@
SubscribeBleCharacteristicCBFunct subscribeCB;
CloseBleCBFunct closeCB;
};
-
-#endif /* DEVICEMANAGER_BLEPLATFORMDELEGATE_H_ */
diff --git a/src/crypto/tests/AES_CCM_128_test_vectors.h b/src/crypto/tests/AES_CCM_128_test_vectors.h
index 33a0539..2adac02 100644
--- a/src/crypto/tests/AES_CCM_128_test_vectors.h
+++ b/src/crypto/tests/AES_CCM_128_test_vectors.h
@@ -19,8 +19,7 @@
* @file - This file contains AES-CCM test vectors.
*/
-#ifndef _AES_CCM_128_TEST_VECTORS_H_
-#define _AES_CCM_128_TEST_VECTORS_H_
+#pragma once
#include <stddef.h>
@@ -966,5 +965,3 @@
&chiptest_dac9e1195a0d_test_vector_217, &chiptest_dac9e1195a0d_test_vector_224, &chiptest_dac9e1195a0d_test_vector_231,
&chiptest_dac9e1195a0d_test_vector_238, &chiptest_dac9e1195a0d_test_vector_245, &chiptest_dac9e1195a0d_test_vector_252
};
-
-#endif // _AES_CCM_128_TEST_VECTORS_H_
diff --git a/src/crypto/tests/PBKDF2_SHA256_test_vectors.h b/src/crypto/tests/PBKDF2_SHA256_test_vectors.h
index 0984fab..f5e01e0 100644
--- a/src/crypto/tests/PBKDF2_SHA256_test_vectors.h
+++ b/src/crypto/tests/PBKDF2_SHA256_test_vectors.h
@@ -19,8 +19,7 @@
* @file - This file contains PBKDF2 SHA256 test vectors.
*/
-#ifndef _PBKDF2_SHA256_TEST_VECTORS_H_
-#define _PBKDF2_SHA256_TEST_VECTORS_H_
+#pragma once
#include <stddef.h>
@@ -171,5 +170,3 @@
&chiptest_test_vector_5, &chiptest_test_vector_6, &chiptest_test_vector_7, &chiptest_test_vector_8, &chiptest_test_vector_9,
&chiptest_test_vector_10, &chiptest_test_vector_11
};
-
-#endif // _PBKDF2_SHA256_TEST_VECTORS_H_
diff --git a/src/crypto/tests/TestCryptoLayer.h b/src/crypto/tests/TestCryptoLayer.h
index 8a11404..c060d33 100644
--- a/src/crypto/tests/TestCryptoLayer.h
+++ b/src/crypto/tests/TestCryptoLayer.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef TESTCRYPTOLAYER_H
-#define TESTCRYPTOLAYER_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -34,5 +33,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // TESTCRYPTOLAYER_H
diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h
index c0727e7..c5e39d8 100644
--- a/src/include/platform/CHIPDeviceConfig.h
+++ b/src/include/platform/CHIPDeviceConfig.h
@@ -22,8 +22,7 @@
* Defines compile-time configuration values for the chip Device Layer.
*/
-#ifndef CHIP_DEVICE_CONFIG_H
-#define CHIP_DEVICE_CONFIG_H
+#pragma once
#if CHIP_SEPARATE_CONFIG_H
#include <platform/CHIPDeviceBuildConfig.h>
@@ -912,5 +911,3 @@
#ifndef CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME
#define CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME __TIME__
#endif
-
-#endif // CHIP_DEVICE_CONFIG_H
diff --git a/src/include/platform/CHIPDeviceError.h b/src/include/platform/CHIPDeviceError.h
index f614595..47b1f13 100644
--- a/src/include/platform/CHIPDeviceError.h
+++ b/src/include/platform/CHIPDeviceError.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef CHIP_DEVICE_ERROR_H
-#define CHIP_DEVICE_ERROR_H
+#pragma once
#define CHIP_DEVICE_ERROR_MIN 11000000
#define CHIP_DEVICE_ERROR_MAX 11000999
@@ -58,5 +57,3 @@
*
*/
#define CHIP_DEVICE_ERROR_SOFTWARE_UPDATE_IGNORED _CHIP_DEVICE_ERROR(4)
-
-#endif // CHIP_DEVICE_ERROR_H
diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h
index 5e88516..9f517ee 100644
--- a/src/include/platform/CHIPDeviceEvent.h
+++ b/src/include/platform/CHIPDeviceEvent.h
@@ -22,8 +22,7 @@
* or changes in device state.
*/
-#ifndef CHIP_DEVICE_EVENT_H
-#define CHIP_DEVICE_EVENT_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -395,5 +394,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_EVENT_H
diff --git a/src/include/platform/CHIPDeviceLayer.h b/src/include/platform/CHIPDeviceLayer.h
index b8adde2..b3333c9 100644
--- a/src/include/platform/CHIPDeviceLayer.h
+++ b/src/include/platform/CHIPDeviceLayer.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef CHIP_DEVICE_H
-#define CHIP_DEVICE_H
+#pragma once
#include <platform/CHIPDeviceConfig.h>
@@ -45,5 +44,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_H
diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
index 50db141..46c1a32 100644
--- a/src/include/platform/ConfigurationManager.h
+++ b/src/include/platform/ConfigurationManager.h
@@ -22,8 +22,7 @@
* Defines the public interface for the Device Layer ConfigurationManager object.
*/
-#ifndef CONFIGURATION_MANAGER_H
-#define CONFIGURATION_MANAGER_H
+#pragma once
#include <cstdint>
@@ -541,5 +540,3 @@
#endif // CHIP_DEVICE_CONFIG_ENABLE_JUST_IN_TIME_PROVISIONING
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_H
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
index 8e37bbb..645d075 100644
--- a/src/include/platform/ConnectivityManager.h
+++ b/src/include/platform/ConnectivityManager.h
@@ -21,8 +21,7 @@
* Defines the public interface for the Device Layer ConnectivityManager object.
*/
-#ifndef CONNECTIVITY_MANAGER_H
-#define CONNECTIVITY_MANAGER_H
+#pragma once
#include <support/CodeUtils.h>
@@ -550,5 +549,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_H
diff --git a/src/include/platform/PersistedStorage.h b/src/include/platform/PersistedStorage.h
index 9f726eb..cb22ceb 100644
--- a/src/include/platform/PersistedStorage.h
+++ b/src/include/platform/PersistedStorage.h
@@ -24,8 +24,7 @@
* Platforms will be responsible for implementing the read/write details.
*/
-#ifndef PERSISTED_STORAGE_H
-#define PERSISTED_STORAGE_H
+#pragma once
#include <core/CHIPConfig.h>
#include <core/CHIPError.h>
@@ -91,5 +90,3 @@
} // namespace PersistedStorage
} // namespace Platform
} // namespace chip
-
-#endif // PERSISTED_STORAGE_H
diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h
index 3c042a1..e22a652 100644
--- a/src/include/platform/PlatformManager.h
+++ b/src/include/platform/PlatformManager.h
@@ -21,8 +21,7 @@
* Defines the public interface for the Device Layer PlatformManager object.
*/
-#ifndef PLATFORM_MANAGER_H
-#define PLATFORM_MANAGER_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -251,5 +250,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_H
diff --git a/src/include/platform/SoftwareUpdateManager.h b/src/include/platform/SoftwareUpdateManager.h
index 4fb1f6d..b674044 100644
--- a/src/include/platform/SoftwareUpdateManager.h
+++ b/src/include/platform/SoftwareUpdateManager.h
@@ -21,8 +21,7 @@
* Defines the public interface for the Device Layer SoftwareUpdateManager object.
*/
-#ifndef SOFTWARE_UPDATE_MANAGER_H
-#define SOFTWARE_UPDATE_MANAGER_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
@@ -510,4 +509,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#endif // SOFTWARE_UPDATE_MANAGER_H
diff --git a/src/include/platform/SoftwareUpdateManagerImpl.h b/src/include/platform/SoftwareUpdateManagerImpl.h
index cb46728..3b07219 100644
--- a/src/include/platform/SoftwareUpdateManagerImpl.h
+++ b/src/include/platform/SoftwareUpdateManagerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef SOFTWARE_UPDATE_MANAGER_IMPL_H
-#define SOFTWARE_UPDATE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
@@ -81,4 +80,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#endif // SOFTWARE_UPDATE_MANAGER_IMPL_H
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
index cc4f306..37a98be 100644
--- a/src/include/platform/ThreadStackManager.h
+++ b/src/include/platform/ThreadStackManager.h
@@ -21,8 +21,7 @@
* Defines the public interface for the Device Layer ThreadStackManager object.
*/
-#ifndef THREAD_STACK_MANAGER_H
-#define THREAD_STACK_MANAGER_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -313,5 +312,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // THREAD_STACK_MANAGER_H
diff --git a/src/include/platform/TimeSyncManager.h b/src/include/platform/TimeSyncManager.h
index 09f7acd..1a0c29c 100644
--- a/src/include/platform/TimeSyncManager.h
+++ b/src/include/platform/TimeSyncManager.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef TIME_SYNC_MANAGER_H
-#define TIME_SYNC_MANAGER_H
+#pragma once
namespace chip {
namespace Profiles {
@@ -138,5 +137,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // TIME_SYNC_MANAGER_H
diff --git a/src/include/platform/internal/BLEManager.h b/src/include/platform/internal/BLEManager.h
index 53a2d29..332de0f 100644
--- a/src/include/platform/internal/BLEManager.h
+++ b/src/include/platform/internal/BLEManager.h
@@ -22,8 +22,7 @@
* internal BLEManager object.
*/
-#ifndef BLE_MANAGER_H
-#define BLE_MANAGER_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <support/CodeUtils.h>
@@ -182,4 +181,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#endif // BLE_MANAGER_H
diff --git a/src/include/platform/internal/CHIPDeviceLayerInternal.h b/src/include/platform/internal/CHIPDeviceLayerInternal.h
index 1168ebf..ff2dbc0 100644
--- a/src/include/platform/internal/CHIPDeviceLayerInternal.h
+++ b/src/include/platform/internal/CHIPDeviceLayerInternal.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef CHIP_DEVICE_INTERNAL_H
-#define CHIP_DEVICE_INTERNAL_H
+#pragma once
#include <platform/CHIPDeviceLayer.h>
@@ -41,5 +40,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_INTERNAL_H
diff --git a/src/include/platform/internal/DeviceDescriptionServer.h b/src/include/platform/internal/DeviceDescriptionServer.h
index eb55212..aa2ea8b 100644
--- a/src/include/platform/internal/DeviceDescriptionServer.h
+++ b/src/include/platform/internal/DeviceDescriptionServer.h
@@ -21,8 +21,7 @@
* Defines the Device Layer DeviceDescriptionServer object.
*/
-#ifndef DEVICE_DESCRIPTION_SERVER_H
-#define DEVICE_DESCRIPTION_SERVER_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
#include <profiles/device-description/DeviceDescription.h>
@@ -93,5 +92,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // DEVICE_DESCRIPTION_SERVER_H
diff --git a/src/include/platform/internal/DeviceNetworkInfo.h b/src/include/platform/internal/DeviceNetworkInfo.h
index db4b9d4..d4fa192 100644
--- a/src/include/platform/internal/DeviceNetworkInfo.h
+++ b/src/include/platform/internal/DeviceNetworkInfo.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef DEVICE_NETWORK_INFO_H
-#define DEVICE_NETWORK_INFO_H
+#pragma once
#include <stddef.h>
#include <stdint.h>
@@ -110,5 +109,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // DEVICE_NETWORK_INFO_H
diff --git a/src/include/platform/internal/EventLogging.h b/src/include/platform/internal/EventLogging.h
index f0be9c7..1a8dd07 100644
--- a/src/include/platform/internal/EventLogging.h
+++ b/src/include/platform/internal/EventLogging.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef EVENT_LOGGING_H
-#define EVENT_LOGGING_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -37,5 +36,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // EVENT_LOGGING_H
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.h b/src/include/platform/internal/GenericConfigurationManagerImpl.h
index c5a7438..b1968a2 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.h
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.h
@@ -23,8 +23,7 @@
* for use on various platforms.
*/
-#ifndef GENERIC_CONFIGURATION_MANAGER_IMPL_H
-#define GENERIC_CONFIGURATION_MANAGER_IMPL_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -159,5 +158,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl.h b/src/include/platform/internal/GenericConnectivityManagerImpl.h
index bfae463..6315c25 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl.h
@@ -22,8 +22,7 @@
* for use on various platforms.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -75,5 +74,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h
index 34c92db..136071f 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h
@@ -22,8 +22,7 @@
* for use on platforms that support BLE.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H
+#pragma once
#include <platform/internal/BLEManager.h>
@@ -159,5 +158,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h
index a888e2f..5dc2592 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h
@@ -22,8 +22,7 @@
* for use on platforms that don't have BLE.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_BLE_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_BLE_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -158,5 +157,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_BLE_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
index e0211d7..95ecafe 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
@@ -22,8 +22,7 @@
* for use on platforms that do NOT support Thread.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_THREAD_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_THREAD_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -135,5 +134,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_THREAD_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h
index a084bfd..d0a4912 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h
@@ -22,8 +22,7 @@
* for use on platforms that don't have WiFi.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_WIFI_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_WIFI_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -224,5 +223,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_NO_WIFI_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
index 1eeef77..5cb683a 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
@@ -22,8 +22,7 @@
* for use on platforms that support Thread.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H
+#pragma once
#include <platform/ThreadStackManager.h>
@@ -157,5 +156,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_WiFi.h b/src/include/platform/internal/GenericConnectivityManagerImpl_WiFi.h
index 698db2b..1f76c40 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_WiFi.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_WiFi.h
@@ -21,8 +21,7 @@
* for use on platforms that support WiFi.
*/
-#ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_WIFI_H
-#define GENERIC_CONNECTIVITY_MANAGER_IMPL_WIFI_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/DeviceNetworkInfo.h>
@@ -189,5 +188,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_CONNECTIVITY_MANAGER_IMPL_WIFI_H
diff --git a/src/include/platform/internal/GenericNetworkProvisioningServerImpl.h b/src/include/platform/internal/GenericNetworkProvisioningServerImpl.h
index db50423..9478063 100644
--- a/src/include/platform/internal/GenericNetworkProvisioningServerImpl.h
+++ b/src/include/platform/internal/GenericNetworkProvisioningServerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef GENERIC_NETWORK_PROVISIONING_SERVER_IMPL_H
-#define GENERIC_NETWORK_PROVISIONING_SERVER_IMPL_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -125,5 +124,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_NETWORK_PROVISIONING_SERVER_IMPL_H
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.h b/src/include/platform/internal/GenericPlatformManagerImpl.h
index 60a3788..7a04ab3 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl.h
@@ -22,8 +22,7 @@
* for use on various platforms.
*/
-#ifndef GENERIC_PLATFORM_MANAGER_IMPL_H
-#define GENERIC_PLATFORM_MANAGER_IMPL_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -77,5 +76,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_PLATFORM_MANAGER_IMPL_H
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h
index dddff8d..11dba84 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h
@@ -22,8 +22,7 @@
* for use on FreeRTOS platforms.
*/
-#ifndef GENERIC_PLATFORM_MANAGER_IMPL_FREERTOS_H
-#define GENERIC_PLATFORM_MANAGER_IMPL_FREERTOS_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl.h>
@@ -92,5 +91,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_PLATFORM_MANAGER_IMPL_FREERTOS_H
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h
index fe41bdb..8589925 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h
@@ -22,8 +22,7 @@
* for use on Linux platforms.
*/
-#ifndef GENERIC_PLATFORM_MANAGER_IMPL_POSIX_H
-#define GENERIC_PLATFORM_MANAGER_IMPL_POSIX_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl.h>
@@ -104,5 +103,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_PLATFORM_MANAGER_IMPL_POSIX_H
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h b/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h
index 1df1ed8..6e26e5d 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h
@@ -21,8 +21,7 @@
* for use on Zephyr RTOS platforms.
*/
-#ifndef GENERIC_PLATFORM_MANAGER_IMPL_ZEPHYR_H
-#define GENERIC_PLATFORM_MANAGER_IMPL_ZEPHYR_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl.h>
@@ -99,5 +98,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_PLATFORM_MANAGER_IMPL_ZEPHYR_H
diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h
index 4bce59d..e018975 100644
--- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h
+++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h
@@ -22,8 +22,7 @@
* for use on various platforms.
*/
-#ifndef GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_H
-#define GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_H
+#pragma once
// #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
@@ -134,4 +133,3 @@
} // namespace chip
// #endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#endif // GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_H
diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h
index 4f75909..0acb728 100644
--- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h
+++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h
@@ -22,8 +22,7 @@
* for use on platforms that support BDX.
*/
-#ifndef GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_BDX_H
-#define GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_BDX_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
#include <profiles/bulk-data-transfer/Development/BulkDataTransfer.h>
@@ -93,5 +92,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_BDX_H
diff --git a/src/include/platform/internal/NetworkProvisioningServer.h b/src/include/platform/internal/NetworkProvisioningServer.h
index 1e4219d..f5135a8 100644
--- a/src/include/platform/internal/NetworkProvisioningServer.h
+++ b/src/include/platform/internal/NetworkProvisioningServer.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef NETWORK_PROVISIONING_SERVER_H
-#define NETWORK_PROVISIONING_SERVER_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -104,5 +103,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // NETWORK_PROVISIONING_SERVER_H
diff --git a/src/include/platform/internal/testing/ConfigUnitTest.h b/src/include/platform/internal/testing/ConfigUnitTest.h
index c16cca7..3bcf9bb 100644
--- a/src/include/platform/internal/testing/ConfigUnitTest.h
+++ b/src/include/platform/internal/testing/ConfigUnitTest.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef CHIP_DEVICE_CONFIG_UNIT_TEST_H
-#define CHIP_DEVICE_CONFIG_UNIT_TEST_H
+#pragma once
#include <core/CHIPCore.h>
#include <support/CodeUtils.h>
@@ -200,5 +199,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_CONFIG_UNIT_TEST_H
diff --git a/src/inet/AsyncDNSResolverSockets.h b/src/inet/AsyncDNSResolverSockets.h
index d16c844..fb5becf 100644
--- a/src/inet/AsyncDNSResolverSockets.h
+++ b/src/inet/AsyncDNSResolverSockets.h
@@ -22,8 +22,7 @@
* Asynchronous Domain Name System (DNS) resolution in InetLayer.
*
*/
-#ifndef _ASYNC_DNS_SOCKETS_H_
-#define _ASYNC_DNS_SOCKETS_H_
+#pragma once
#include <inet/IPAddress.h>
#include <inet/InetError.h>
@@ -100,5 +99,3 @@
} // namespace chip
#endif // INET_CONFIG_ENABLE_DNS_RESOLVER && INET_CONFIG_ENABLE_ASYNC_DNS_SOCKETS
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS
-
-#endif // !defined(_ASYNC_DNS_SOCKETS_H_)
diff --git a/src/inet/DNSResolver.h b/src/inet/DNSResolver.h
index 1f487e5..5fbad7f 100644
--- a/src/inet/DNSResolver.h
+++ b/src/inet/DNSResolver.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef DNSRESOLVER_H
-#define DNSRESOLVER_H
+#pragma once
#include <inet/IPAddress.h>
#include <inet/InetError.h>
@@ -171,5 +170,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(DNSRESOLVER_H_)
diff --git a/src/inet/EndPointBasis.h b/src/inet/EndPointBasis.h
index f22f01a..13853de 100644
--- a/src/inet/EndPointBasis.h
+++ b/src/inet/EndPointBasis.h
@@ -22,8 +22,7 @@
* endpoint classes in the Inet layer, i.e. TCP, UDP, Raw and Tun.
*/
-#ifndef ENDPOINTBASIS_H
-#define ENDPOINTBASIS_H
+#pragma once
#include <inet/InetConfig.h>
@@ -189,5 +188,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(ENDPOINTBASIS_H)
diff --git a/src/inet/IANAConstants.h b/src/inet/IANAConstants.h
index 8d2501a..05b3efa 100644
--- a/src/inet/IANAConstants.h
+++ b/src/inet/IANAConstants.h
@@ -25,8 +25,7 @@
* definitions in any underlying IP stacks.
*/
-#ifndef IANACONSTANTS_H
-#define IANACONSTANTS_H
+#pragma once
namespace chip {
namespace Inet {
@@ -113,5 +112,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(IANACONSTANTS_H)
diff --git a/src/inet/IPAddress.h b/src/inet/IPAddress.h
index 6bb26ef..f6ae8e2 100644
--- a/src/inet/IPAddress.h
+++ b/src/inet/IPAddress.h
@@ -26,8 +26,7 @@
* internally in the V4COMPAT format, reserved for that purpose.)
*/
-#ifndef IPADDRESS_H
-#define IPADDRESS_H
+#pragma once
#include <stddef.h>
#include <stdint.h>
@@ -677,5 +676,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(IPADDRESS_H)
diff --git a/src/inet/IPEndPointBasis.h b/src/inet/IPEndPointBasis.h
index e6d2f3e..597622d 100644
--- a/src/inet/IPEndPointBasis.h
+++ b/src/inet/IPEndPointBasis.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef IPENDPOINTBASIS_H
-#define IPENDPOINTBASIS_H
+#pragma once
#include <inet/EndPointBasis.h>
@@ -204,5 +203,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(IPENDPOINTBASIS_H)
diff --git a/src/inet/IPPrefix.h b/src/inet/IPPrefix.h
index 43372e7..c255a0a 100644
--- a/src/inet/IPPrefix.h
+++ b/src/inet/IPPrefix.h
@@ -25,8 +25,7 @@
* address prefixes of both IPv4 and IPv6 address families.
*/
-#ifndef IPPREFIX_H
-#define IPPREFIX_H
+#pragma once
#include <inet/IPAddress.h>
@@ -128,5 +127,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(IPPREFIX_H)
diff --git a/src/inet/Inet.h b/src/inet/Inet.h
index 48fa948..84566fd 100644
--- a/src/inet/Inet.h
+++ b/src/inet/Inet.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef INET_H
-#define INET_H
+#pragma once
#include <inet/InetConfig.h>
@@ -50,5 +49,3 @@
#if INET_CONFIG_ENABLE_UDP_ENDPOINT
#include <inet/UDPEndPoint.h>
#endif // INET_CONFIG_ENABLE_UDP_ENDPOINT
-
-#endif // !defined(INET_H)
diff --git a/src/inet/InetArgParser.h b/src/inet/InetArgParser.h
index b5fbd35..f9cb822 100644
--- a/src/inet/InetArgParser.h
+++ b/src/inet/InetArgParser.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef INETARGPARSER_H_
-#define INETARGPARSER_H_
+#pragma once
#include <core/CHIPConfig.h>
@@ -43,5 +42,3 @@
} // namespace chip
#endif // CHIP_CONFIG_ENABLE_ARG_PARSER
-
-#endif // INETARGPARSER_H_
diff --git a/src/inet/InetConfig.h b/src/inet/InetConfig.h
index be80073..3f88e1a 100644
--- a/src/inet/InetConfig.h
+++ b/src/inet/InetConfig.h
@@ -33,8 +33,7 @@
*
*/
-#ifndef INETCONFIG_H
-#define INETCONFIG_H
+#pragma once
#if CHIP_SEPARATE_CONFIG_H
#include <inet/InetBuildConfig.h>
@@ -510,5 +509,3 @@
#define INET_CONFIG_IP_MULTICAST_HOP_LIMIT (64)
#endif // INET_CONFIG_IP_MULTICAST_HOP_LIMIT
// clang-format on
-
-#endif /* INETCONFIG_H */
diff --git a/src/inet/InetError.h b/src/inet/InetError.h
index f2ae3e1..9e6f1f7 100644
--- a/src/inet/InetError.h
+++ b/src/inet/InetError.h
@@ -28,8 +28,7 @@
*
*/
-#ifndef INETERROR_H
-#define INETERROR_H
+#pragma once
#include <inet/InetConfig.h>
@@ -377,5 +376,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(INETERROR_H)
diff --git a/src/inet/InetFaultInjection.h b/src/inet/InetFaultInjection.h
index e5fcaf8..178d654 100644
--- a/src/inet/InetFaultInjection.h
+++ b/src/inet/InetFaultInjection.h
@@ -21,8 +21,7 @@
* Header file for the fault-injection utilities for Inet.
*/
-#ifndef INET_FAULT_INJECTION_H_
-#define INET_FAULT_INJECTION_H_
+#pragma once
#include <inet/InetConfig.h>
@@ -73,5 +72,3 @@
#define INET_FAULT_INJECT(aFaultID, aStatement)
#endif // INET_CONFIG_TEST
-
-#endif // INET_FAULT_INJECTION_H_
diff --git a/src/inet/InetInterface.h b/src/inet/InetInterface.h
index 532f22d..ed86431 100644
--- a/src/inet/InetInterface.h
+++ b/src/inet/InetInterface.h
@@ -24,8 +24,7 @@
* of system interface addresses.
*/
-#ifndef INETINTERFACE_H
-#define INETINTERFACE_H
+#pragma once
#include <inet/InetConfig.h>
@@ -296,5 +295,3 @@
} // namespace Inet
} // namespace chip
-
-#endif /* INETINTERFACE_H */
diff --git a/src/inet/InetLayer.h b/src/inet/InetLayer.h
index d311227..0067c80 100644
--- a/src/inet/InetLayer.h
+++ b/src/inet/InetLayer.h
@@ -41,8 +41,7 @@
*
*/
-#ifndef INETLAYER_H
-#define INETLAYER_H
+#pragma once
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
@@ -343,5 +342,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(INETLAYER_H)
diff --git a/src/inet/InetLayerBasis.h b/src/inet/InetLayerBasis.h
index 050540b..37c3a39 100644
--- a/src/inet/InetLayerBasis.h
+++ b/src/inet/InetLayerBasis.h
@@ -23,8 +23,7 @@
* the pending or resulting I/O events on a socket.
*/
-#ifndef INETLAYERBASIS_H
-#define INETLAYERBASIS_H
+#pragma once
#include <inet/InetConfig.h>
@@ -222,5 +221,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(INETLAYERBASIS_H)
diff --git a/src/inet/InetLayerEvents.h b/src/inet/InetLayerEvents.h
index 1f52e75..9cb155d 100644
--- a/src/inet/InetLayerEvents.h
+++ b/src/inet/InetLayerEvents.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef INETLAYEREVENTS_H
-#define INETLAYEREVENTS_H
+#pragma once
#include <inet/InetConfig.h>
@@ -68,4 +67,3 @@
} // namespace chip
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
-#endif // !defined(INETLAYEREVENTS_H)
diff --git a/src/inet/RawEndPoint.h b/src/inet/RawEndPoint.h
index 5758457..1a80676 100644
--- a/src/inet/RawEndPoint.h
+++ b/src/inet/RawEndPoint.h
@@ -26,8 +26,7 @@
* control blocks, as the system is configured accordingly.
*/
-#ifndef RAWENDPOINT_H
-#define RAWENDPOINT_H
+#pragma once
#include "inet/IPEndPointBasis.h"
#include <inet/IPAddress.h>
@@ -115,5 +114,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(RAWENDPOINT_H)
diff --git a/src/inet/TCPEndPoint.h b/src/inet/TCPEndPoint.h
index d0fe633..17559a8 100644
--- a/src/inet/TCPEndPoint.h
+++ b/src/inet/TCPEndPoint.h
@@ -25,8 +25,7 @@
* control blocks, as the system is configured accordingly.
*/
-#ifndef TCPENDPOINT_H
-#define TCPENDPOINT_H
+#pragma once
#include <inet/EndPointBasis.h>
#include <inet/IPAddress.h>
@@ -691,5 +690,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(TCPENDPOINT_H)
diff --git a/src/inet/UDPEndPoint.h b/src/inet/UDPEndPoint.h
index 1cdbd04..c567a14 100644
--- a/src/inet/UDPEndPoint.h
+++ b/src/inet/UDPEndPoint.h
@@ -26,8 +26,7 @@
* control blocks, as the system is configured accordingly.
*/
-#ifndef UDPENDPOINT_H
-#define UDPENDPOINT_H
+#pragma once
#include "inet/IPEndPointBasis.h"
#include <inet/IPAddress.h>
@@ -95,5 +94,3 @@
} // namespace Inet
} // namespace chip
-
-#endif // !defined(UDPENDPOINT_H)
diff --git a/src/inet/ZephyrSocket.h b/src/inet/ZephyrSocket.h
index 5b08712..56cc9dc 100644
--- a/src/inet/ZephyrSocket.h
+++ b/src/inet/ZephyrSocket.h
@@ -21,8 +21,7 @@
* reasons have not (yet) been implemented or exposed in Zephyr.
*/
-#ifndef INET_ZEPHYR_SOCKET_H
-#define INET_ZEPHYR_SOCKET_H
+#pragma once
#include <sys/socket.h>
@@ -46,5 +45,3 @@
return ret;
}
-
-#endif // INET_ZEPHYR_SOCKET_H
diff --git a/src/inet/arpa-inet-compatibility.h b/src/inet/arpa-inet-compatibility.h
index 562b31b..bd7cb1e 100644
--- a/src/inet/arpa-inet-compatibility.h
+++ b/src/inet/arpa-inet-compatibility.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef ARPA_INET_COMPATIBILITY_H
-#define ARPA_INET_COMPATIBILITY_H
+#pragma once
#include <system/SystemConfig.h>
@@ -41,5 +40,3 @@
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
#endif // !CHIP_SYSTEM_CONFIG_USE_SOCKETS
-
-#endif // !defined(ARPA_INET_COMPATIBILITY_H)
diff --git a/src/inet/tests/TestInetCommon.h b/src/inet/tests/TestInetCommon.h
index 3bd78cf..24340ab 100644
--- a/src/inet/tests/TestInetCommon.h
+++ b/src/inet/tests/TestInetCommon.h
@@ -28,8 +28,7 @@
*
*/
-#ifndef CHIP_TEST_INET_COMMON_H_
-#define CHIP_TEST_INET_COMMON_H_
+#pragma once
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
@@ -97,4 +96,3 @@
extern void SetupFaultInjectionContext(int argc, char * argv[]);
extern void SetupFaultInjectionContext(int argc, char * argv[], int32_t (*aNumEventsAvailable)(),
void (*aInjectAsyncEvents)(int32_t index));
-#endif /* CHIP_TEST_INET_COMMON_H_ */
diff --git a/src/inet/tests/TestInetCommonOptions.h b/src/inet/tests/TestInetCommonOptions.h
index 447ccc9..590cbbb 100644
--- a/src/inet/tests/TestInetCommonOptions.h
+++ b/src/inet/tests/TestInetCommonOptions.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef CHIP_TEST_INET_COMMON_OPTIONS_H_
-#define CHIP_TEST_INET_COMMON_OPTIONS_H_
+#pragma once
#include <vector>
@@ -95,4 +94,3 @@
};
extern FaultInjectionOptions gFaultInjectionOptions;
-#endif // CHIP_TEST_INET_COMMON_OPTIONS_H_
diff --git a/src/inet/tests/TestInetLayer.h b/src/inet/tests/TestInetLayer.h
index acccd2f..1c13b7d 100644
--- a/src/inet/tests/TestInetLayer.h
+++ b/src/inet/tests/TestInetLayer.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef TESTINETLAYER_H
-#define TESTINETLAYER_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -38,5 +37,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // TESTINETLAYER_H
diff --git a/src/lib/support/DLLUtil.h b/src/lib/support/DLLUtil.h
index 7cd4b1e..b62b226 100644
--- a/src/lib/support/DLLUtil.h
+++ b/src/lib/support/DLLUtil.h
@@ -26,8 +26,7 @@
*
*/
-#ifndef DLLEXPORT_H_
-#define DLLEXPORT_H_
+#pragma once
#if defined _WIN32 || defined __CYGWIN__
#define DLL_IMPORT __declspec(dllimport)
@@ -44,5 +43,3 @@
#define DLL_LOCAL
#endif
#endif
-
-#endif /* DLLEXPORT_H_ */
diff --git a/src/lib/support/SafeInt.h b/src/lib/support/SafeInt.h
index 473df45..f513b76 100644
--- a/src/lib/support/SafeInt.h
+++ b/src/lib/support/SafeInt.h
@@ -21,8 +21,7 @@
*
*/
-#ifndef SAFEINT_H_
-#define SAFEINT_H_
+#pragma once
#include <limits>
#include <stdint.h>
@@ -143,5 +142,3 @@
}
} // namespace chip
-
-#endif // SAFEINT_H_
diff --git a/src/platform/Darwin/BLEManagerImpl.h b/src/platform/Darwin/BLEManagerImpl.h
index 6c81a2b..5e4e7e8 100644
--- a/src/platform/Darwin/BLEManagerImpl.h
+++ b/src/platform/Darwin/BLEManagerImpl.h
@@ -21,8 +21,7 @@
* for the Darwin platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -93,5 +92,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/Darwin/BleApplicationDelegate.h b/src/platform/Darwin/BleApplicationDelegate.h
index 16cc0d5..662b43b 100644
--- a/src/platform/Darwin/BleApplicationDelegate.h
+++ b/src/platform/Darwin/BleApplicationDelegate.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef BLE_APPLICATION_DELEGATE_H
-#define BLE_APPLICATION_DELEGATE_H
+#pragma once
#include <ble/BleApplicationDelegate.h>
@@ -33,5 +32,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // BLE_APPLICATION_DELEGATE_H
diff --git a/src/platform/Darwin/BleConnectionDelegate.h b/src/platform/Darwin/BleConnectionDelegate.h
index da8d365..57cb638 100644
--- a/src/platform/Darwin/BleConnectionDelegate.h
+++ b/src/platform/Darwin/BleConnectionDelegate.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef BLE_CONNECTION_DELEGATE_H
-#define BLE_CONNECTION_DELEGATE_H
+#pragma once
#include <ble/BleConnectionDelegate.h>
@@ -35,5 +34,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // BLE_CONNECTION_DELEGATE_H
diff --git a/src/platform/Darwin/BlePlatformConfig.h b/src/platform/Darwin/BlePlatformConfig.h
index 45cf868..a27bfa2 100644
--- a/src/platform/Darwin/BlePlatformConfig.h
+++ b/src/platform/Darwin/BlePlatformConfig.h
@@ -22,13 +22,10 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/Darwin/BlePlatformDelegate.h b/src/platform/Darwin/BlePlatformDelegate.h
index c3c9517..06539cb 100644
--- a/src/platform/Darwin/BlePlatformDelegate.h
+++ b/src/platform/Darwin/BlePlatformDelegate.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef BLE_PLATFORM_DELEGATE_H
-#define BLE_PLATFORM_DELEGATE_H
+#pragma once
#include <ble/BlePlatformDelegate.h>
#include <system/SystemPacketBuffer.h>
@@ -48,5 +47,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // BLE_PLATFORM_DELEGATE_H
diff --git a/src/platform/Darwin/CHIPDevicePlatformConfig.h b/src/platform/Darwin/CHIPDevicePlatformConfig.h
index 4a71963..ee2f929 100644
--- a/src/platform/Darwin/CHIPDevicePlatformConfig.h
+++ b/src/platform/Darwin/CHIPDevicePlatformConfig.h
@@ -21,8 +21,7 @@
* on Darwin platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -81,5 +80,3 @@
// TODO: CHIP has redesigned the crypto interface, pending on the final version of CHIP HASH APIs
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/Darwin/CHIPDevicePlatformEvent.h b/src/platform/Darwin/CHIPDevicePlatformEvent.h
index de478fa..45e8718 100644
--- a/src/platform/Darwin/CHIPDevicePlatformEvent.h
+++ b/src/platform/Darwin/CHIPDevicePlatformEvent.h
@@ -21,8 +21,7 @@
* Device Layer on Darwin platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -74,5 +73,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/Darwin/CHIPPlatformConfig.h b/src/platform/Darwin/CHIPPlatformConfig.h
index 9f3ac4c..1efde6c 100644
--- a/src/platform/Darwin/CHIPPlatformConfig.h
+++ b/src/platform/Darwin/CHIPPlatformConfig.h
@@ -21,8 +21,7 @@
* Darwin platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
// ==================== General Platform Adaptations ====================
@@ -106,5 +105,3 @@
#ifndef CHIP_CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER 1
#endif // CHIP_CONFIG_ENABLE_CASE_RESPONDER
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/Darwin/ConfigurationManagerImpl.h b/src/platform/Darwin/ConfigurationManagerImpl.h
index 696c52b..af89e66 100644
--- a/src/platform/Darwin/ConfigurationManagerImpl.h
+++ b/src/platform/Darwin/ConfigurationManagerImpl.h
@@ -21,8 +21,7 @@
* for Darwin platforms.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericConfigurationManagerImpl.h>
@@ -92,5 +91,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/Darwin/ConnectivityManagerImpl.h b/src/platform/Darwin/ConnectivityManagerImpl.h
index 20fd1ea..e267e6c 100644
--- a/src/platform/Darwin/ConnectivityManagerImpl.h
+++ b/src/platform/Darwin/ConnectivityManagerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -119,5 +118,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/Darwin/InetPlatformConfig.h b/src/platform/Darwin/InetPlatformConfig.h
index 6921715..faf47c6 100644
--- a/src/platform/Darwin/InetPlatformConfig.h
+++ b/src/platform/Darwin/InetPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -38,5 +37,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/Darwin/PlatformManagerImpl.h b/src/platform/Darwin/PlatformManagerImpl.h
index 7230a3e..8e6d0a5 100644
--- a/src/platform/Darwin/PlatformManagerImpl.h
+++ b/src/platform/Darwin/PlatformManagerImpl.h
@@ -21,8 +21,7 @@
* Provides an implementation of the PlatformManager object.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl_POSIX.h>
@@ -87,5 +86,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/Darwin/PosixConfig.h b/src/platform/Darwin/PosixConfig.h
index 7d0320b..e1af67c 100644
--- a/src/platform/Darwin/PosixConfig.h
+++ b/src/platform/Darwin/PosixConfig.h
@@ -21,8 +21,7 @@
* Darwin platforms.
*/
-#ifndef POSIX_CONFIG_H
-#define POSIX_CONFIG_H
+#pragma once
#include <functional>
#include <inttypes.h>
@@ -120,5 +119,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // POSIX_CONFIG_H
diff --git a/src/platform/Darwin/SystemPlatformConfig.h b/src/platform/Darwin/SystemPlatformConfig.h
index 8793d28..f1cee97 100644
--- a/src/platform/Darwin/SystemPlatformConfig.h
+++ b/src/platform/Darwin/SystemPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -48,5 +47,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/BLEManagerImpl.h b/src/platform/EFR32/BLEManagerImpl.h
index 3d793da..c1e341d 100644
--- a/src/platform/EFR32/BLEManagerImpl.h
+++ b/src/platform/EFR32/BLEManagerImpl.h
@@ -22,8 +22,7 @@
* for the Silicon Labs EFR32 platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -195,5 +194,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/EFR32/BlePlatformConfig.h b/src/platform/EFR32/BlePlatformConfig.h
index 9d4168f..1ff731d 100644
--- a/src/platform/EFR32/BlePlatformConfig.h
+++ b/src/platform/EFR32/BlePlatformConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
#include "bg_errorcodes.h"
@@ -43,5 +42,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h
index a441e52..809e6d2 100644
--- a/src/platform/EFR32/CHIPDevicePlatformConfig.h
+++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h
@@ -22,8 +22,7 @@
* on EFR32 platforms using the Silicon Labs SDK.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -132,5 +131,3 @@
#define CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME "Bluetooth App Task"
#endif // CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/CHIPDevicePlatformEvent.h b/src/platform/EFR32/CHIPDevicePlatformEvent.h
index fb879db..234a132 100644
--- a/src/platform/EFR32/CHIPDevicePlatformEvent.h
+++ b/src/platform/EFR32/CHIPDevicePlatformEvent.h
@@ -22,8 +22,7 @@
* Device Layer on EFR32 platforms using the Silicon Labs SDK.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -70,5 +69,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/EFR32/CHIPPlatformConfig.h b/src/platform/EFR32/CHIPPlatformConfig.h
index 72b80f9..c561443 100644
--- a/src/platform/EFR32/CHIPPlatformConfig.h
+++ b/src/platform/EFR32/CHIPPlatformConfig.h
@@ -22,8 +22,7 @@
* Silcon Labs EFR32 platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -128,5 +127,3 @@
#ifndef CHIP_CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER 1
#endif // CHIP_CONFIG_ENABLE_CASE_RESPONDER
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/EFR32/ConfigurationManagerImpl.h b/src/platform/EFR32/ConfigurationManagerImpl.h
index 8aec32e..f28e9a2 100644
--- a/src/platform/EFR32/ConfigurationManagerImpl.h
+++ b/src/platform/EFR32/ConfigurationManagerImpl.h
@@ -22,8 +22,7 @@
* for EFR32 platforms using the Silicon Labs SDK.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericConfigurationManagerImpl.h>
@@ -107,5 +106,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/EFR32/ConnectivityManagerImpl.h b/src/platform/EFR32/ConnectivityManagerImpl.h
index 55e1c53..97a49c5 100644
--- a/src/platform/EFR32/ConnectivityManagerImpl.h
+++ b/src/platform/EFR32/ConnectivityManagerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -117,5 +116,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/EFR32/EFR32Config.h b/src/platform/EFR32/EFR32Config.h
index 8278903..1fb3930 100644
--- a/src/platform/EFR32/EFR32Config.h
+++ b/src/platform/EFR32/EFR32Config.h
@@ -22,8 +22,7 @@
* platforms based on the Silicon Labs SDK.
*/
-#ifndef EFR32_CONFIG_H
-#define EFR32_CONFIG_H
+#pragma once
#include <functional>
@@ -145,5 +144,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // EFR32_CONFIG_H
diff --git a/src/platform/EFR32/InetPlatformConfig.h b/src/platform/EFR32/InetPlatformConfig.h
index e757035..2f4a01b 100644
--- a/src/platform/EFR32/InetPlatformConfig.h
+++ b/src/platform/EFR32/InetPlatformConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -46,5 +45,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/NetworkProvisioningServerImpl.h b/src/platform/EFR32/NetworkProvisioningServerImpl.h
index 6b556dc..19f71ed 100644
--- a/src/platform/EFR32/NetworkProvisioningServerImpl.h
+++ b/src/platform/EFR32/NetworkProvisioningServerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef NETWORK_PROVISIONING_SERVER_IMPL_H
-#define NETWORK_PROVISIONING_SERVER_IMPL_H
+#pragma once
#include <platform/internal/GenericNetworkProvisioningServerImpl.h>
@@ -78,5 +77,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // NETWORK_PROVISIONING_SERVER_IMPL_H
diff --git a/src/platform/EFR32/PlatformManagerImpl.h b/src/platform/EFR32/PlatformManagerImpl.h
index 317b702..2f7de1d 100644
--- a/src/platform/EFR32/PlatformManagerImpl.h
+++ b/src/platform/EFR32/PlatformManagerImpl.h
@@ -22,8 +22,7 @@
* for EFR32 platforms using the Silicon Labs SDK.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
@@ -90,5 +89,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/EFR32/SoftwareUpdateManagerImpl.h b/src/platform/EFR32/SoftwareUpdateManagerImpl.h
index 65b700c..e3e55c3 100644
--- a/src/platform/EFR32/SoftwareUpdateManagerImpl.h
+++ b/src/platform/EFR32/SoftwareUpdateManagerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef SOFTWARE_UPDATE_MANAGER_IMPL_H
-#define SOFTWARE_UPDATE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
@@ -87,4 +86,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#endif // SOFTWARE_UPDATE_MANAGER_IMPL_H
diff --git a/src/platform/EFR32/SystemPlatformConfig.h b/src/platform/EFR32/SystemPlatformConfig.h
index c1346c7..2e3db33 100644
--- a/src/platform/EFR32/SystemPlatformConfig.h
+++ b/src/platform/EFR32/SystemPlatformConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -57,5 +56,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/ThreadStackManagerImpl.h b/src/platform/EFR32/ThreadStackManagerImpl.h
index e6e87dc..a9953d0 100644
--- a/src/platform/EFR32/ThreadStackManagerImpl.h
+++ b/src/platform/EFR32/ThreadStackManagerImpl.h
@@ -23,8 +23,7 @@
* stack.
*/
-#ifndef THREAD_STACK_MANAGER_IMPL_H
-#define THREAD_STACK_MANAGER_IMPL_H
+#pragma once
#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
@@ -120,5 +119,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // THREAD_STACK_MANAGER_IMPL_H
diff --git a/src/platform/EFR32/WarmPlatformConfig.h b/src/platform/EFR32/WarmPlatformConfig.h
index 3497be5..cdc8d88 100644
--- a/src/platform/EFR32/WarmPlatformConfig.h
+++ b/src/platform/EFR32/WarmPlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef WARM_PLATFORM_CONFIG_H
-#define WARM_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -38,5 +37,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // WARM_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/efr32-chip-mbedtls-config.h b/src/platform/EFR32/efr32-chip-mbedtls-config.h
index 051ca9f..086e5dc 100644
--- a/src/platform/EFR32/efr32-chip-mbedtls-config.h
+++ b/src/platform/EFR32/efr32-chip-mbedtls-config.h
@@ -26,8 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef EFR32_MBEDTLS_CONFIG_H
-#define EFR32_MBEDTLS_CONFIG_H
+#pragma once
#include <limits.h>
#include <stdio.h>
@@ -259,5 +258,3 @@
#if defined(MBEDTLS_USER_CONFIG_FILE)
#include MBEDTLS_USER_CONFIG_FILE
#endif
-
-#endif // EFR32_MBEDTLS_CONFIG_H
diff --git a/src/platform/EFR32/freertos_bluetooth.h b/src/platform/EFR32/freertos_bluetooth.h
index 4ac338d..da5c612 100644
--- a/src/platform/EFR32/freertos_bluetooth.h
+++ b/src/platform/EFR32/freertos_bluetooth.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef FREERTOS_BLUETOOTH_H
-#define FREERTOS_BLUETOOTH_H
+#pragma once
#if __cplusplus
extern "C" {
@@ -79,5 +78,3 @@
#if __cplusplus
}
#endif
-
-#endif // FREERTOS_BLUETOOTH_H
diff --git a/src/platform/ESP32/BLEManagerImpl.h b/src/platform/ESP32/BLEManagerImpl.h
index 4961590..5c0eba0 100644
--- a/src/platform/ESP32/BLEManagerImpl.h
+++ b/src/platform/ESP32/BLEManagerImpl.h
@@ -23,8 +23,7 @@
* for the ESP32 platform.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -266,5 +265,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/ESP32/BlePlatformConfig.h b/src/platform/ESP32/BlePlatformConfig.h
index 38026e6..4dd3222 100644
--- a/src/platform/ESP32/BlePlatformConfig.h
+++ b/src/platform/ESP32/BlePlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
#include "esp_err.h"
@@ -40,5 +39,3 @@
#define BLE_CONFIG_ERROR_MIN 6000000
#define BLE_CONFIG_ERROR_MAX 6000999
#define _BLE_CONFIG_ERROR(e) (BLE_CONFIG_ERROR_MIN + (e))
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h
index 242a9aa..3a61b60 100644
--- a/src/platform/ESP32/CHIPDevicePlatformConfig.h
+++ b/src/platform/ESP32/CHIPDevicePlatformConfig.h
@@ -23,8 +23,7 @@
* on the ESP32.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -77,5 +76,3 @@
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH CONFIG_LOG_PROVISIONING_HASH
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/ESP32/CHIPDevicePlatformEvent.h b/src/platform/ESP32/CHIPDevicePlatformEvent.h
index a75e4ba..f054c83 100644
--- a/src/platform/ESP32/CHIPDevicePlatformEvent.h
+++ b/src/platform/ESP32/CHIPDevicePlatformEvent.h
@@ -23,8 +23,7 @@
* CHIP Device Layer on the ESP32.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -77,5 +76,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h
index 0803880..c129548 100644
--- a/src/platform/ESP32/CHIPPlatformConfig.h
+++ b/src/platform/ESP32/CHIPPlatformConfig.h
@@ -23,8 +23,7 @@
* the ESP32 platform.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
#include "esp_err.h"
@@ -99,5 +98,3 @@
#define CHIP_CONFIG_ENABLE_CASE_INITIATOR CONFIG_ENABLE_CASE_INITIATOR
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_DEFAULT_INCOMING_CONNECTION_IDLE_TIMEOUT CONFIG_DEFAULT_INCOMING_CONNECTION_IDLE_TIMEOUT
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/ESP32/ConfigurationManagerImpl.h b/src/platform/ESP32/ConfigurationManagerImpl.h
index 9338e09..162ff0b 100644
--- a/src/platform/ESP32/ConfigurationManagerImpl.h
+++ b/src/platform/ESP32/ConfigurationManagerImpl.h
@@ -23,8 +23,7 @@
* for the ESP32 platform.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConfigurationManagerImpl.h>
@@ -114,5 +113,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/ESP32/ConnectivityManagerImpl.h b/src/platform/ESP32/ConnectivityManagerImpl.h
index 0f627e0..43197dd 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl.h
+++ b/src/platform/ESP32/ConnectivityManagerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -242,5 +241,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/ESP32/ESP32Config.h b/src/platform/ESP32/ESP32Config.h
index aa1f729..46fdb87 100644
--- a/src/platform/ESP32/ESP32Config.h
+++ b/src/platform/ESP32/ESP32Config.h
@@ -23,8 +23,7 @@
* Utilities for interacting with the the ESP32 "NVS" key-value store.
*/
-#ifndef ESP32_CONFIG_H
-#define ESP32_CONFIG_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -117,5 +116,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // ESP32_CONFIG_H
diff --git a/src/platform/ESP32/ESP32Utils.h b/src/platform/ESP32/ESP32Utils.h
index c498dc5..02c32b2 100644
--- a/src/platform/ESP32/ESP32Utils.h
+++ b/src/platform/ESP32/ESP32Utils.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef ESP_UTILS_H
-#define ESP_UTILS_H
+#pragma once
#include "platform/internal/DeviceNetworkInfo.h"
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -51,5 +50,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // ESP_UTILS_H
diff --git a/src/platform/ESP32/InetPlatformConfig.h b/src/platform/ESP32/InetPlatformConfig.h
index c7f89e6..0053c23 100644
--- a/src/platform/ESP32/InetPlatformConfig.h
+++ b/src/platform/ESP32/InetPlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
#include "esp_err.h"
@@ -47,5 +46,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS CONFIG_NUM_UDP_ENDPOINTS
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/ESP32/NetworkProvisioningServerImpl.h b/src/platform/ESP32/NetworkProvisioningServerImpl.h
index f43c765..179be49 100644
--- a/src/platform/ESP32/NetworkProvisioningServerImpl.h
+++ b/src/platform/ESP32/NetworkProvisioningServerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef NETWORK_PROVISIONING_SERVER_IMPL_H
-#define NETWORK_PROVISIONING_SERVER_IMPL_H
+#pragma once
#include <platform/internal/GenericNetworkProvisioningServerImpl.h>
@@ -95,5 +94,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // NETWORK_PROVISIONING_SERVER_IMPL_H
diff --git a/src/platform/ESP32/PlatformManagerImpl.h b/src/platform/ESP32/PlatformManagerImpl.h
index dbb83f0..44bed54 100644
--- a/src/platform/ESP32/PlatformManagerImpl.h
+++ b/src/platform/ESP32/PlatformManagerImpl.h
@@ -23,8 +23,7 @@
* for the ESP32 platform.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
@@ -89,5 +88,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/ESP32/SoftwareUpdateManagerImpl.h b/src/platform/ESP32/SoftwareUpdateManagerImpl.h
index 14cc35f..4d941cb 100644
--- a/src/platform/ESP32/SoftwareUpdateManagerImpl.h
+++ b/src/platform/ESP32/SoftwareUpdateManagerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef SOFTWARE_UPDATE_MANAGER_IMPL_H
-#define SOFTWARE_UPDATE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
@@ -88,4 +87,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#endif // SOFTWARE_UPDATE_MANAGER_IMPL_H
diff --git a/src/platform/ESP32/SystemPlatformConfig.h b/src/platform/ESP32/SystemPlatformConfig.h
index 4338fe0..2907302 100644
--- a/src/platform/ESP32/SystemPlatformConfig.h
+++ b/src/platform/ESP32/SystemPlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -62,5 +61,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS CONFIG_NUM_TIMERS
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/ESP32/WarmPlatformConfig.h b/src/platform/ESP32/WarmPlatformConfig.h
index 2a4c1a6..ba1274e 100644
--- a/src/platform/ESP32/WarmPlatformConfig.h
+++ b/src/platform/ESP32/WarmPlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef WARM_PLATFORM_CONFIG_H
-#define WARM_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -38,5 +37,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // WARM_PLATFORM_CONFIG_H
diff --git a/src/platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h b/src/platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h
index da09f0b..dfbe50c 100644
--- a/src/platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h
+++ b/src/platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h
@@ -23,8 +23,7 @@
* for use on FreeRTOS platforms.
*/
-#ifndef GENERIC_THREAD_STACK_MANAGER_IMPL_FREERTOS_H
-#define GENERIC_THREAD_STACK_MANAGER_IMPL_FREERTOS_H
+#pragma once
#if defined(ESP_PLATFORM)
#include "freertos/FreeRTOS.h"
@@ -91,5 +90,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_THREAD_STACK_MANAGER_IMPL_FREERTOS_H
diff --git a/src/platform/K32W/BLEManagerImpl.h b/src/platform/K32W/BLEManagerImpl.h
index dc5e4bc..2fbee62 100644
--- a/src/platform/K32W/BLEManagerImpl.h
+++ b/src/platform/K32W/BLEManagerImpl.h
@@ -23,8 +23,7 @@
* for the K32W platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -187,5 +186,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/K32W/BlePlatformConfig.h b/src/platform/K32W/BlePlatformConfig.h
index 4ccd10b..f8a287f 100755
--- a/src/platform/K32W/BlePlatformConfig.h
+++ b/src/platform/K32W/BlePlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -34,5 +33,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/K32W/CHIPDevicePlatformConfig.h b/src/platform/K32W/CHIPDevicePlatformConfig.h
index 8b317d7..5e0cf76 100644
--- a/src/platform/K32W/CHIPDevicePlatformConfig.h
+++ b/src/platform/K32W/CHIPDevicePlatformConfig.h
@@ -23,8 +23,7 @@
* on K32W platforms using the NXP SDK.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -86,5 +85,3 @@
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 1
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/K32W/CHIPDevicePlatformEvent.h b/src/platform/K32W/CHIPDevicePlatformEvent.h
index 95d77af..1e8ad8d 100755
--- a/src/platform/K32W/CHIPDevicePlatformEvent.h
+++ b/src/platform/K32W/CHIPDevicePlatformEvent.h
@@ -23,8 +23,7 @@
* Device Layer on K32W061 platforms using the NXP SDK.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -71,5 +70,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/K32W/CHIPPlatformConfig.h b/src/platform/K32W/CHIPPlatformConfig.h
index c9813b7..3ee938d 100644
--- a/src/platform/K32W/CHIPPlatformConfig.h
+++ b/src/platform/K32W/CHIPPlatformConfig.h
@@ -23,8 +23,7 @@
* NXP K32W platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -137,5 +136,3 @@
#ifndef WDM_PUBLISHER_MAX_NOTIFIES_IN_FLIGHT
#define WDM_PUBLISHER_MAX_NOTIFIES_IN_FLIGHT 2
#endif // WDM_PUBLISHER_MAX_NOTIFIES_IN_FLIGHT
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/K32W/ConfigurationManagerImpl.h b/src/platform/K32W/ConfigurationManagerImpl.h
index 2763927..220581e 100644
--- a/src/platform/K32W/ConfigurationManagerImpl.h
+++ b/src/platform/K32W/ConfigurationManagerImpl.h
@@ -23,8 +23,7 @@
* for K32W platforms using the NXP SDK.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include "K32WConfig.h"
#include <platform/internal/GenericConfigurationManagerImpl.h>
@@ -107,5 +106,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/K32W/ConnectivityManagerImpl.h b/src/platform/K32W/ConnectivityManagerImpl.h
index 5a11b75..2c2840f 100644
--- a/src/platform/K32W/ConnectivityManagerImpl.h
+++ b/src/platform/K32W/ConnectivityManagerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -114,5 +113,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/K32W/InetPlatformConfig.h b/src/platform/K32W/InetPlatformConfig.h
index f13146c..ebac09e 100644
--- a/src/platform/K32W/InetPlatformConfig.h
+++ b/src/platform/K32W/InetPlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -47,5 +46,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/K32W/K32WConfig.h b/src/platform/K32W/K32WConfig.h
index 08f711c..b93f987 100644
--- a/src/platform/K32W/K32WConfig.h
+++ b/src/platform/K32W/K32WConfig.h
@@ -22,8 +22,7 @@
* platforms based on the NXP K32W SDK.
*/
-#ifndef K32W_CONFIG_H
-#define K32W_CONFIG_H
+#pragma once
#include <functional>
@@ -172,5 +171,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // K32W_CONFIG_H
diff --git a/src/platform/K32W/NetworkProvisioningServerImpl.h b/src/platform/K32W/NetworkProvisioningServerImpl.h
index c05a9fd..2e17e45 100644
--- a/src/platform/K32W/NetworkProvisioningServerImpl.h
+++ b/src/platform/K32W/NetworkProvisioningServerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef NETWORK_PROVISIONING_SERVER_IMPL_H
-#define NETWORK_PROVISIONING_SERVER_IMPL_H
+#pragma once
#include <platform/internal/GenericNetworkProvisioningServerImpl.h>
@@ -79,5 +78,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // NETWORK_PROVISIONING_SERVER_IMPL_H
diff --git a/src/platform/K32W/PlatformManagerImpl.h b/src/platform/K32W/PlatformManagerImpl.h
index 34739ab..4e0e355 100644
--- a/src/platform/K32W/PlatformManagerImpl.h
+++ b/src/platform/K32W/PlatformManagerImpl.h
@@ -23,8 +23,7 @@
* for K32W platforms using the NXP SDK.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
@@ -91,5 +90,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/K32W/SoftwareUpdateManagerImpl.h b/src/platform/K32W/SoftwareUpdateManagerImpl.h
index 114374f..f040254 100644
--- a/src/platform/K32W/SoftwareUpdateManagerImpl.h
+++ b/src/platform/K32W/SoftwareUpdateManagerImpl.h
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-#ifndef SOFTWARE_UPDATE_MANAGER_IMPL_H
-#define SOFTWARE_UPDATE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
@@ -88,4 +87,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#endif // SOFTWARE_UPDATE_MANAGER_IMPL_H
diff --git a/src/platform/K32W/SystemPlatformConfig.h b/src/platform/K32W/SystemPlatformConfig.h
index e449bed..f514d49 100644
--- a/src/platform/K32W/SystemPlatformConfig.h
+++ b/src/platform/K32W/SystemPlatformConfig.h
@@ -24,8 +24,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -58,5 +57,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/K32W/ThreadStackManagerImpl.h b/src/platform/K32W/ThreadStackManagerImpl.h
index 3712e8e..e73a555 100644
--- a/src/platform/K32W/ThreadStackManagerImpl.h
+++ b/src/platform/K32W/ThreadStackManagerImpl.h
@@ -23,8 +23,7 @@
* for K32W platforms using the NXP SDK and the OpenThread stack.
*/
-#ifndef THREAD_STACK_MANAGER_IMPL_H
-#define THREAD_STACK_MANAGER_IMPL_H
+#pragma once
#include <openthread/tasklet.h>
#include <openthread/thread.h>
@@ -119,5 +118,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // THREAD_STACK_MANAGER_IMPL_H
diff --git a/src/platform/K32W/WarmPlatformConfig.h b/src/platform/K32W/WarmPlatformConfig.h
index b75511c..b249c23 100644
--- a/src/platform/K32W/WarmPlatformConfig.h
+++ b/src/platform/K32W/WarmPlatformConfig.h
@@ -25,8 +25,7 @@
*
*/
-#ifndef WARM_PLATFORM_CONFIG_H
-#define WARM_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -39,5 +38,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // WARM_PLATFORM_CONFIG_H
diff --git a/src/platform/K32W/k32w-chip-mbedtls-config.h b/src/platform/K32W/k32w-chip-mbedtls-config.h
index d54aec8..6af6b0a 100644
--- a/src/platform/K32W/k32w-chip-mbedtls-config.h
+++ b/src/platform/K32W/k32w-chip-mbedtls-config.h
@@ -27,8 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef K32W061_MBEDTLS_CONFIG_H
-#define K32W061_MBEDTLS_CONFIG_H
+#pragma once
#if defined(MBEDTLS_ECP_WINDOW_SIZE)
#undef MBEDTLS_ECP_WINDOW_SIZE
@@ -245,5 +244,3 @@
#endif /* USE_RTOS*/
/**************************** KSDK end ****************************************/
#endif /* MBEDTLS_AES_ALT || MBEDTLS_SHA256_ALT */
-
-#endif // K32W061_MBEDTLS_CONFIG_H
diff --git a/src/platform/Linux/BLEManagerImpl.h b/src/platform/Linux/BLEManagerImpl.h
index 7265f18..e3d66af 100644
--- a/src/platform/Linux/BLEManagerImpl.h
+++ b/src/platform/Linux/BLEManagerImpl.h
@@ -21,8 +21,7 @@
* for the Linux platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#include <ble/BleLayer.h>
#include <platform/internal/BLEManager.h>
@@ -248,5 +247,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/Linux/BlePlatformConfig.h b/src/platform/Linux/BlePlatformConfig.h
index 0c56a3b..4c1ffd4 100644
--- a/src/platform/Linux/BlePlatformConfig.h
+++ b/src/platform/Linux/BlePlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -38,5 +37,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/Linux/CHIPBluezHelper.h b/src/platform/Linux/CHIPBluezHelper.h
index 7ebd3ab..c265d94 100644
--- a/src/platform/Linux/CHIPBluezHelper.h
+++ b/src/platform/Linux/CHIPBluezHelper.h
@@ -48,8 +48,7 @@
* Provides Bluez dbus implementation for BLE
*/
-#ifndef CHIP_BLUEZ_HELPER_H
-#define CHIP_BLUEZ_HELPER_H
+#pragma once
#include "BLEManagerImpl.h"
#include <stdbool.h>
@@ -217,4 +216,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#endif // CHIP_BLUEZ_HELPER_H
diff --git a/src/platform/Linux/CHIPDevicePlatformConfig.h b/src/platform/Linux/CHIPDevicePlatformConfig.h
index 5039554..e344661 100644
--- a/src/platform/Linux/CHIPDevicePlatformConfig.h
+++ b/src/platform/Linux/CHIPDevicePlatformConfig.h
@@ -21,8 +21,7 @@
* on Linux platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -85,5 +84,3 @@
// TODO: CHIP has redesigned the crypto interface, pending on the final version of CHIP HASH APIs
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/Linux/CHIPDevicePlatformEvent.h b/src/platform/Linux/CHIPDevicePlatformEvent.h
index 998ab75..b0849ef 100644
--- a/src/platform/Linux/CHIPDevicePlatformEvent.h
+++ b/src/platform/Linux/CHIPDevicePlatformEvent.h
@@ -21,8 +21,7 @@
* Device Layer on Linux platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -93,5 +92,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/Linux/CHIPLinuxStorage.h b/src/platform/Linux/CHIPLinuxStorage.h
index 1aeb1f2..e79282a 100644
--- a/src/platform/Linux/CHIPLinuxStorage.h
+++ b/src/platform/Linux/CHIPLinuxStorage.h
@@ -31,8 +31,7 @@
*
*/
-#ifndef CHIP_LINUX_STORAGE_H
-#define CHIP_LINUX_STORAGE_H
+#pragma once
#include <mutex>
#include <platform/Linux/CHIPLinuxStorageIni.h>
@@ -94,5 +93,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif /* CHIP_LINUX_STORAGE_H */
diff --git a/src/platform/Linux/CHIPLinuxStorageIni.h b/src/platform/Linux/CHIPLinuxStorageIni.h
index 458c373..240d74c 100644
--- a/src/platform/Linux/CHIPLinuxStorageIni.h
+++ b/src/platform/Linux/CHIPLinuxStorageIni.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef CHIP_LINUX_STORAGE_INI_H
-#define CHIP_LINUX_STORAGE_INI_H
+#pragma once
#include <inipp/inipp.h>
#include <platform/PersistedStorage.h>
@@ -61,5 +60,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_LINUX_STORAGE_INI_H
diff --git a/src/platform/Linux/CHIPPlatformConfig.h b/src/platform/Linux/CHIPPlatformConfig.h
index 854953e..b9eb03d 100644
--- a/src/platform/Linux/CHIPPlatformConfig.h
+++ b/src/platform/Linux/CHIPPlatformConfig.h
@@ -21,8 +21,7 @@
* Linux platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
// ==================== General Platform Adaptations ====================
@@ -109,5 +108,3 @@
#ifndef CHIP_CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER 1
#endif // CHIP_CONFIG_ENABLE_CASE_RESPONDER
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/Linux/ConfigurationManagerImpl.h b/src/platform/Linux/ConfigurationManagerImpl.h
index 5c453a4..7a717ea 100644
--- a/src/platform/Linux/ConfigurationManagerImpl.h
+++ b/src/platform/Linux/ConfigurationManagerImpl.h
@@ -21,8 +21,7 @@
* for Linux platforms.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericConfigurationManagerImpl.h>
@@ -96,5 +95,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
index 432ec86..dd280fb 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.h
+++ b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -177,5 +176,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/Linux/InetPlatformConfig.h b/src/platform/Linux/InetPlatformConfig.h
index 7bda3e4..cf38ae6 100644
--- a/src/platform/Linux/InetPlatformConfig.h
+++ b/src/platform/Linux/InetPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -38,5 +37,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/Linux/PlatformManagerImpl.h b/src/platform/Linux/PlatformManagerImpl.h
index dea59a1..5b16356 100644
--- a/src/platform/Linux/PlatformManagerImpl.h
+++ b/src/platform/Linux/PlatformManagerImpl.h
@@ -21,8 +21,7 @@
* Provides an implementation of the PlatformManager object.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <memory>
#include <platform/internal/GenericPlatformManagerImpl_POSIX.h>
@@ -102,5 +101,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/Linux/PosixConfig.h b/src/platform/Linux/PosixConfig.h
index 0e8d204..bac6963 100644
--- a/src/platform/Linux/PosixConfig.h
+++ b/src/platform/Linux/PosixConfig.h
@@ -21,8 +21,7 @@
* Linux platforms.
*/
-#ifndef POSIX_CONFIG_H
-#define POSIX_CONFIG_H
+#pragma once
#include <functional>
#include <inttypes.h>
@@ -125,5 +124,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // POSIX_CONFIG_H
diff --git a/src/platform/Linux/SystemPlatformConfig.h b/src/platform/Linux/SystemPlatformConfig.h
index eded108..8c8520f 100644
--- a/src/platform/Linux/SystemPlatformConfig.h
+++ b/src/platform/Linux/SystemPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -48,5 +47,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
index 59d828f..3c36c89 100644
--- a/src/platform/Linux/ThreadStackManagerImpl.h
+++ b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef CHIP_PLATFORM_LINUX_THREAD_STACK_MANAGER_IMPL_H
-#define CHIP_PLATFORM_LINUX_THREAD_STACK_MANAGER_IMPL_H
+#pragma once
#include <memory>
#include <thread>
@@ -109,5 +108,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_PLATFORM_LINUX_THREAD_STACK_MANAGER_IMPL_H
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
index 29646e6..9957eca 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h
@@ -23,8 +23,7 @@
* for use on platforms that use OpenThread.
*/
-#ifndef GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_H
-#define GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_H
+#pragma once
#include <openthread/instance.h>
@@ -132,5 +131,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_H
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h
index 86f42f6..c829512 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h
@@ -23,8 +23,7 @@
* for use on platforms that use OpenThread with LwIP.
*/
-#ifndef GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_LWIP_H
-#define GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_LWIP_H
+#pragma once
#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
@@ -96,5 +95,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_THREAD_STACK_MANAGER_IMPL_OPENTHREAD_LWIP_H
diff --git a/src/platform/OpenThread/OpenThreadUtils.h b/src/platform/OpenThread/OpenThreadUtils.h
index 8787ddf..de70fdb 100644
--- a/src/platform/OpenThread/OpenThreadUtils.h
+++ b/src/platform/OpenThread/OpenThreadUtils.h
@@ -22,8 +22,7 @@
* Utility functions for working with OpenThread.
*/
-#ifndef OPENTHREAD_UTILS_H
-#define OPENTHREAD_UTILS_H
+#pragma once
#include <string.h>
@@ -91,5 +90,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // OPENTHREAD_UTILS_H
diff --git a/src/platform/Zephyr/GenericBLEManagerImpl_Zephyr.h b/src/platform/Zephyr/GenericBLEManagerImpl_Zephyr.h
index aa5fa26..7c19021 100644
--- a/src/platform/Zephyr/GenericBLEManagerImpl_Zephyr.h
+++ b/src/platform/Zephyr/GenericBLEManagerImpl_Zephyr.h
@@ -21,8 +21,7 @@
* for the Zephyr platforms.
*/
-#ifndef GENERIC_BLE_MANAGER_IMPL_ZEPHYR_H
-#define GENERIC_BLE_MANAGER_IMPL_ZEPHYR_H
+#pragma once
#include <bluetooth/bluetooth.h>
#include <bluetooth/conn.h>
@@ -164,5 +163,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_BLE_MANAGER_IMPL_ZEPHYR_H
diff --git a/src/platform/Zephyr/GenericThreadStackManagerImpl_Zephyr.h b/src/platform/Zephyr/GenericThreadStackManagerImpl_Zephyr.h
index b1317de..0e10553 100644
--- a/src/platform/Zephyr/GenericThreadStackManagerImpl_Zephyr.h
+++ b/src/platform/Zephyr/GenericThreadStackManagerImpl_Zephyr.h
@@ -22,8 +22,7 @@
* for use on Zephyr platforms.
*/
-#ifndef GENERIC_THREAD_STACK_MANAGER_IMPL_ZEPHYR_H
-#define GENERIC_THREAD_STACK_MANAGER_IMPL_ZEPHYR_H
+#pragma once
#include <net/openthread.h>
#include <zephyr.h>
@@ -143,5 +142,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // GENERIC_THREAD_STACK_MANAGER_IMPL_ZEPHYR_H
diff --git a/src/platform/nRF5/BLEManagerImpl.h b/src/platform/nRF5/BLEManagerImpl.h
index 4877d96..bafedbe 100644
--- a/src/platform/nRF5/BLEManagerImpl.h
+++ b/src/platform/nRF5/BLEManagerImpl.h
@@ -22,8 +22,7 @@
* for the nRF5 platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -207,5 +206,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/nRF5/BlePlatformConfig.h b/src/platform/nRF5/BlePlatformConfig.h
index cb4c3fb..9d0385e 100644
--- a/src/platform/nRF5/BlePlatformConfig.h
+++ b/src/platform/nRF5/BlePlatformConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
#include <ble_types.h>
@@ -43,5 +42,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/nRF5/CHIPDevicePlatformConfig.h b/src/platform/nRF5/CHIPDevicePlatformConfig.h
index a9ee2a0..906b8ae 100644
--- a/src/platform/nRF5/CHIPDevicePlatformConfig.h
+++ b/src/platform/nRF5/CHIPDevicePlatformConfig.h
@@ -22,8 +22,7 @@
* on nRF52 platforms using the Nordic nRF5 SDK.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -88,5 +87,3 @@
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/nRF5/CHIPDevicePlatformEvent.h b/src/platform/nRF5/CHIPDevicePlatformEvent.h
index 79967d9..8fb8dbd 100644
--- a/src/platform/nRF5/CHIPDevicePlatformEvent.h
+++ b/src/platform/nRF5/CHIPDevicePlatformEvent.h
@@ -22,8 +22,7 @@
* Device Layer on nRF52 platforms using the Nordic nRF5 SDK.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -84,5 +83,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/nRF5/CHIPPlatformConfig.h b/src/platform/nRF5/CHIPPlatformConfig.h
index 3ff23d3..1e074bc 100644
--- a/src/platform/nRF5/CHIPPlatformConfig.h
+++ b/src/platform/nRF5/CHIPPlatformConfig.h
@@ -22,8 +22,7 @@
* Nordic nRF52 platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
#include "sdk_config.h"
#include "sdk_errors.h"
@@ -121,5 +120,3 @@
#ifndef CHIP_CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER 1
#endif // CHIP_CONFIG_ENABLE_CASE_RESPONDER
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/nRF5/ConfigurationManagerImpl.h b/src/platform/nRF5/ConfigurationManagerImpl.h
index fb25179..4ddd962 100644
--- a/src/platform/nRF5/ConfigurationManagerImpl.h
+++ b/src/platform/nRF5/ConfigurationManagerImpl.h
@@ -22,8 +22,7 @@
* for nRF52 platforms using the Nordic nRF5 SDK.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericConfigurationManagerImpl.h>
#include <platform/nRF5/nRF5Config.h>
@@ -101,5 +100,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/nRF5/ConnectivityManagerImpl.h b/src/platform/nRF5/ConnectivityManagerImpl.h
index 1b808a5..1519b72 100644
--- a/src/platform/nRF5/ConnectivityManagerImpl.h
+++ b/src/platform/nRF5/ConnectivityManagerImpl.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -119,5 +118,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/nRF5/InetPlatformConfig.h b/src/platform/nRF5/InetPlatformConfig.h
index 56e07c5..4c97283 100644
--- a/src/platform/nRF5/InetPlatformConfig.h
+++ b/src/platform/nRF5/InetPlatformConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
#include "sdk_errors.h"
@@ -46,5 +45,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/nRF5/PlatformManagerImpl.h b/src/platform/nRF5/PlatformManagerImpl.h
index c3bb3f1..94c0360 100644
--- a/src/platform/nRF5/PlatformManagerImpl.h
+++ b/src/platform/nRF5/PlatformManagerImpl.h
@@ -21,8 +21,7 @@
* Provides an implementation of the PlatformManager object.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
@@ -89,5 +88,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/nRF5/SystemPlatformConfig.h b/src/platform/nRF5/SystemPlatformConfig.h
index b16585d..c5a012f 100644
--- a/src/platform/nRF5/SystemPlatformConfig.h
+++ b/src/platform/nRF5/SystemPlatformConfig.h
@@ -23,8 +23,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -59,5 +58,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/nRF5/ThreadStackManagerImpl.h b/src/platform/nRF5/ThreadStackManagerImpl.h
index 599652d..11be0c9 100644
--- a/src/platform/nRF5/ThreadStackManagerImpl.h
+++ b/src/platform/nRF5/ThreadStackManagerImpl.h
@@ -23,8 +23,7 @@
* stack.
*/
-#ifndef THREAD_STACK_MANAGER_IMPL_H
-#define THREAD_STACK_MANAGER_IMPL_H
+#pragma once
#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
@@ -120,5 +119,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // THREAD_STACK_MANAGER_IMPL_H
diff --git a/src/platform/nRF5/nRF5Config.h b/src/platform/nRF5/nRF5Config.h
index 1baaba8..052119c 100644
--- a/src/platform/nRF5/nRF5Config.h
+++ b/src/platform/nRF5/nRF5Config.h
@@ -23,8 +23,7 @@
* platforms based on the Nordic nRF5 SDK.
*/
-#ifndef NRF5_CONFIG_H
-#define NRF5_CONFIG_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -204,5 +203,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // NRF5_CONFIG_H
diff --git a/src/platform/nRF5/nRF5Utils.h b/src/platform/nRF5/nRF5Utils.h
index a90d820..04b0296 100644
--- a/src/platform/nRF5/nRF5Utils.h
+++ b/src/platform/nRF5/nRF5Utils.h
@@ -21,8 +21,7 @@
* Utilities for working with the Nordic nRF5 SDK.
*/
-#ifndef NRF5_UTILS_H
-#define NRF5_UTILS_H
+#pragma once
namespace chip {
namespace DeviceLayer {
@@ -34,5 +33,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // NRF5_UTILS_H
diff --git a/src/platform/nrfconnect/BLEManagerImpl.h b/src/platform/nrfconnect/BLEManagerImpl.h
index 3ea6fa2..bc5264c 100644
--- a/src/platform/nrfconnect/BLEManagerImpl.h
+++ b/src/platform/nrfconnect/BLEManagerImpl.h
@@ -21,8 +21,7 @@
* for the Zephyr platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -83,5 +82,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/nrfconnect/BlePlatformConfig.h b/src/platform/nrfconnect/BlePlatformConfig.h
index 05ece42..c0ae7b3 100644
--- a/src/platform/nrfconnect/BlePlatformConfig.h
+++ b/src/platform/nrfconnect/BlePlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
#include <bluetooth/bluetooth.h>
@@ -36,5 +35,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
index 9dbb63f..21056d0 100644
--- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -21,8 +21,7 @@
* on Zephyr platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
#include "autoconf.h"
@@ -61,5 +60,3 @@
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformEvent.h b/src/platform/nrfconnect/CHIPDevicePlatformEvent.h
index 9d360fb..e3f6766 100644
--- a/src/platform/nrfconnect/CHIPDevicePlatformEvent.h
+++ b/src/platform/nrfconnect/CHIPDevicePlatformEvent.h
@@ -21,8 +21,7 @@
* Device Layer on Zephyr platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -103,5 +102,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/nrfconnect/CHIPPlatformConfig.h b/src/platform/nrfconnect/CHIPPlatformConfig.h
index 0a9054a..c929fa6 100644
--- a/src/platform/nrfconnect/CHIPPlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPPlatformConfig.h
@@ -21,8 +21,7 @@
* Zephyr platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
// ==================== General Platform Adaptations ====================
@@ -106,5 +105,3 @@
#ifndef CHIP_CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER 1
#endif // CHIP_CONFIG_ENABLE_CASE_RESPONDER
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/nrfconnect/ConfigurationManagerImpl.h b/src/platform/nrfconnect/ConfigurationManagerImpl.h
index 55966be..38a8293 100644
--- a/src/platform/nrfconnect/ConfigurationManagerImpl.h
+++ b/src/platform/nrfconnect/ConfigurationManagerImpl.h
@@ -21,8 +21,7 @@
* for Zephyr platforms.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericConfigurationManagerImpl.h>
@@ -117,5 +116,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/nrfconnect/ConnectivityManagerImpl.h b/src/platform/nrfconnect/ConnectivityManagerImpl.h
index fda70ac..6a36854 100644
--- a/src/platform/nrfconnect/ConnectivityManagerImpl.h
+++ b/src/platform/nrfconnect/ConnectivityManagerImpl.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -120,5 +119,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/nrfconnect/InetPlatformConfig.h b/src/platform/nrfconnect/InetPlatformConfig.h
index 358ab29..3057444 100644
--- a/src/platform/nrfconnect/InetPlatformConfig.h
+++ b/src/platform/nrfconnect/InetPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -49,5 +48,3 @@
#ifdef HAVE_SO_BINDTODEVICE
#undef HAVE_SO_BINDTODEVICE
#endif // HAVE_SO_BINDTODEVICE
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/nrfconnect/PlatformManagerImpl.h b/src/platform/nrfconnect/PlatformManagerImpl.h
index 1d60654..37160c8 100644
--- a/src/platform/nrfconnect/PlatformManagerImpl.h
+++ b/src/platform/nrfconnect/PlatformManagerImpl.h
@@ -20,8 +20,7 @@
* Provides an implementation of the PlatformManager object.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/PlatformManager.h>
#include <platform/internal/GenericPlatformManagerImpl_Zephyr.h>
@@ -77,5 +76,3 @@
}
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/nrfconnect/SystemPlatformConfig.h b/src/platform/nrfconnect/SystemPlatformConfig.h
index 1568d3c..0e58ba4 100644
--- a/src/platform/nrfconnect/SystemPlatformConfig.h
+++ b/src/platform/nrfconnect/SystemPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -53,5 +52,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/nrfconnect/ThreadStackManagerImpl.h b/src/platform/nrfconnect/ThreadStackManagerImpl.h
index fa99ad5..d46c92f 100644
--- a/src/platform/nrfconnect/ThreadStackManagerImpl.h
+++ b/src/platform/nrfconnect/ThreadStackManagerImpl.h
@@ -21,8 +21,7 @@
* nRF Connect SDK platforms.
*/
-#ifndef THREAD_STACK_MANAGER_IMPL_H
-#define THREAD_STACK_MANAGER_IMPL_H
+#pragma once
#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
#include <platform/Zephyr/GenericThreadStackManagerImpl_Zephyr.h>
@@ -90,5 +89,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // THREAD_STACK_MANAGER_IMPL_H
diff --git a/src/platform/nrfconnect/ZephyrConfig.h b/src/platform/nrfconnect/ZephyrConfig.h
index 7e6019f..f50cf39 100644
--- a/src/platform/nrfconnect/ZephyrConfig.h
+++ b/src/platform/nrfconnect/ZephyrConfig.h
@@ -21,8 +21,7 @@
* Zephyr platforms.
*/
-#ifndef ZEPHYR_CONFIG_H
-#define ZEPHYR_CONFIG_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -94,5 +93,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // ZEPHYR_CONFIG_H
diff --git a/src/platform/qpg6100/BLEManagerImpl.h b/src/platform/qpg6100/BLEManagerImpl.h
index 97b1f66..8c2ef50 100644
--- a/src/platform/qpg6100/BLEManagerImpl.h
+++ b/src/platform/qpg6100/BLEManagerImpl.h
@@ -21,8 +21,7 @@
* for the QPG6100 platforms.
*/
-#ifndef BLE_MANAGER_IMPL_H
-#define BLE_MANAGER_IMPL_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -180,5 +179,3 @@
} // namespace chip
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#endif // BLE_MANAGER_IMPL_H
diff --git a/src/platform/qpg6100/BlePlatformConfig.h b/src/platform/qpg6100/BlePlatformConfig.h
index a7992a5..e9cf130 100644
--- a/src/platform/qpg6100/BlePlatformConfig.h
+++ b/src/platform/qpg6100/BlePlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef BLE_PLATFORM_CONFIG_H
-#define BLE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -40,5 +39,3 @@
// ========== Platform-specific Configuration Overrides =========
/* none so far */
-
-#endif // BLE_PLATFORM_CONFIG_H
diff --git a/src/platform/qpg6100/CHIPDevicePlatformConfig.h b/src/platform/qpg6100/CHIPDevicePlatformConfig.h
index 2ca92ed..b3a8886 100644
--- a/src/platform/qpg6100/CHIPDevicePlatformConfig.h
+++ b/src/platform/qpg6100/CHIPDevicePlatformConfig.h
@@ -21,8 +21,7 @@
* on QPG6100 platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_CONFIG_H
-#define CHIP_DEVICE_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -63,5 +62,3 @@
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
-
-#endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/qpg6100/CHIPDevicePlatformEvent.h b/src/platform/qpg6100/CHIPDevicePlatformEvent.h
index 61b04d9..bab4e40 100644
--- a/src/platform/qpg6100/CHIPDevicePlatformEvent.h
+++ b/src/platform/qpg6100/CHIPDevicePlatformEvent.h
@@ -21,8 +21,7 @@
* Device Layer on QPG6100 platforms.
*/
-#ifndef CHIP_DEVICE_PLATFORM_EVENT_H
-#define CHIP_DEVICE_PLATFORM_EVENT_H
+#pragma once
#include <platform/CHIPDeviceEvent.h>
@@ -88,5 +87,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CHIP_DEVICE_PLATFORM_EVENT_H
diff --git a/src/platform/qpg6100/CHIPPlatformConfig.h b/src/platform/qpg6100/CHIPPlatformConfig.h
index 4a2510d..64982c4 100644
--- a/src/platform/qpg6100/CHIPPlatformConfig.h
+++ b/src/platform/qpg6100/CHIPPlatformConfig.h
@@ -21,8 +21,7 @@
* QPG6100 platforms.
*/
-#ifndef CHIP_PLATFORM_CONFIG_H
-#define CHIP_PLATFORM_CONFIG_H
+#pragma once
// ==================== General Platform Adaptations ====================
@@ -121,5 +120,3 @@
#ifndef CHIP_CONFIG_ENABLE_CASE_RESPONDER
#define CHIP_CONFIG_ENABLE_CASE_RESPONDER 1
#endif // CHIP_CONFIG_ENABLE_CASE_RESPONDER
-
-#endif /* CHIP_PLATFORM_CONFIG_H */
diff --git a/src/platform/qpg6100/ConfigurationManagerImpl.h b/src/platform/qpg6100/ConfigurationManagerImpl.h
index 684510c..12f322c 100644
--- a/src/platform/qpg6100/ConfigurationManagerImpl.h
+++ b/src/platform/qpg6100/ConfigurationManagerImpl.h
@@ -21,8 +21,7 @@
* for QPG6100 platforms.
*/
-#ifndef CONFIGURATION_MANAGER_IMPL_H
-#define CONFIGURATION_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericConfigurationManagerImpl.h>
#include <platform/qpg6100/qpg6100Config.h>
@@ -98,5 +97,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONFIGURATION_MANAGER_IMPL_H
diff --git a/src/platform/qpg6100/ConnectivityManagerImpl.h b/src/platform/qpg6100/ConnectivityManagerImpl.h
index 661cb62..1a4489f 100644
--- a/src/platform/qpg6100/ConnectivityManagerImpl.h
+++ b/src/platform/qpg6100/ConnectivityManagerImpl.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef CONNECTIVITY_MANAGER_IMPL_H
-#define CONNECTIVITY_MANAGER_IMPL_H
+#pragma once
#include <platform/ConnectivityManager.h>
#include <platform/internal/GenericConnectivityManagerImpl.h>
@@ -118,5 +117,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // CONNECTIVITY_MANAGER_IMPL_H
diff --git a/src/platform/qpg6100/InetPlatformConfig.h b/src/platform/qpg6100/InetPlatformConfig.h
index aafa83f..63b8717 100644
--- a/src/platform/qpg6100/InetPlatformConfig.h
+++ b/src/platform/qpg6100/InetPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef INET_PLATFORM_CONFIG_H
-#define INET_PLATFORM_CONFIG_H
+#pragma once
// ==================== Platform Adaptations ====================
@@ -43,5 +42,3 @@
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
-
-#endif // INET_PLATFORM_CONFIG_H
diff --git a/src/platform/qpg6100/PlatformManagerImpl.h b/src/platform/qpg6100/PlatformManagerImpl.h
index cb57002..98e3d35 100644
--- a/src/platform/qpg6100/PlatformManagerImpl.h
+++ b/src/platform/qpg6100/PlatformManagerImpl.h
@@ -20,8 +20,7 @@
* Provides an implementation of the PlatformManager object for the QPG6100 platform.
*/
-#ifndef PLATFORM_MANAGER_IMPL_H
-#define PLATFORM_MANAGER_IMPL_H
+#pragma once
#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
@@ -86,5 +85,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // PLATFORM_MANAGER_IMPL_H
diff --git a/src/platform/qpg6100/SystemPlatformConfig.h b/src/platform/qpg6100/SystemPlatformConfig.h
index 2cf3266..452c110 100644
--- a/src/platform/qpg6100/SystemPlatformConfig.h
+++ b/src/platform/qpg6100/SystemPlatformConfig.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef SYSTEM_PLATFORM_CONFIG_H
-#define SYSTEM_PLATFORM_CONFIG_H
+#pragma once
#include <stdint.h>
@@ -56,5 +55,3 @@
#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 16
#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
-
-#endif // SYSTEM_PLATFORM_CONFIG_H
diff --git a/src/platform/qpg6100/ThreadStackManagerImpl.h b/src/platform/qpg6100/ThreadStackManagerImpl.h
index f6f03fb..ec148f2 100644
--- a/src/platform/qpg6100/ThreadStackManagerImpl.h
+++ b/src/platform/qpg6100/ThreadStackManagerImpl.h
@@ -22,8 +22,7 @@
* stack.
*/
-#ifndef THREAD_STACK_MANAGER_IMPL_H
-#define THREAD_STACK_MANAGER_IMPL_H
+#pragma once
#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
@@ -117,5 +116,3 @@
} // namespace DeviceLayer
} // namespace chip
-
-#endif // THREAD_STACK_MANAGER_IMPL_H
diff --git a/src/platform/qpg6100/qpg6100Config.h b/src/platform/qpg6100/qpg6100Config.h
index f3a73f6..f393d4f 100644
--- a/src/platform/qpg6100/qpg6100Config.h
+++ b/src/platform/qpg6100/qpg6100Config.h
@@ -21,8 +21,7 @@
* platforms based on the Qorvo QPG6100 SDK.
*/
-#ifndef QPG6100_CONFIG_H
-#define QPG6100_CONFIG_H
+#pragma once
#include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -133,5 +132,3 @@
} // namespace Internal
} // namespace DeviceLayer
} // namespace chip
-
-#endif // QPG6100_CONFIG_H
diff --git a/src/platform/tests/TestCHIPoBLEStackMgr.h b/src/platform/tests/TestCHIPoBLEStackMgr.h
index dfa33d0..2c97e84 100644
--- a/src/platform/tests/TestCHIPoBLEStackMgr.h
+++ b/src/platform/tests/TestCHIPoBLEStackMgr.h
@@ -21,10 +21,8 @@
*
*/
-#ifndef CHIP_TEST_CHIP_BLE_STACK_MGR_H
-#define CHIP_TEST_CHIP_BLE_STACK_MGR_H
+#pragma once
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
int TestCHIPoBLEStackManager();
#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#endif // CHIP_TEST_CHIP_BLE_STACK_MGR_H
diff --git a/src/platform/tests/TestConfigurationMgr.h b/src/platform/tests/TestConfigurationMgr.h
index 45f10de..a86c7e9 100644
--- a/src/platform/tests/TestConfigurationMgr.h
+++ b/src/platform/tests/TestConfigurationMgr.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef TESTCONFIGURATIONMGR_H
-#define TESTCONFIGURATIONMGR_H
+#pragma once
int TestConfigurationMgr();
-
-#endif // TESTCONFIGURATIONMGR_H
diff --git a/src/platform/tests/TestPlatformMgr.h b/src/platform/tests/TestPlatformMgr.h
index 93178ca..ecfb634 100644
--- a/src/platform/tests/TestPlatformMgr.h
+++ b/src/platform/tests/TestPlatformMgr.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef TESTPLATFORMMGR_H
-#define TESTPLATFORMMGR_H
+#pragma once
int TestPlatformMgr();
-
-#endif // TESTPLATFORMMGR_H
diff --git a/src/platform/tests/TestPlatformTime.h b/src/platform/tests/TestPlatformTime.h
index 1d9f72a..dfa1505 100644
--- a/src/platform/tests/TestPlatformTime.h
+++ b/src/platform/tests/TestPlatformTime.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef TESTPLATFORMTIME_H
-#define TESTPLATFORMTIME_H
+#pragma once
int TestPlatformTime();
-
-#endif // TESTPLATFORMTIME_H
diff --git a/src/platform/tests/TestThreadStackMgr.h b/src/platform/tests/TestThreadStackMgr.h
index 9e3bdfa..a05a494 100644
--- a/src/platform/tests/TestThreadStackMgr.h
+++ b/src/platform/tests/TestThreadStackMgr.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef CHIP_TEST_THREAD_STACK_MGR_H
-#define CHIP_TEST_THREAD_STACK_MGR_H
+#pragma once
int TestThreadStackManager(void);
-
-#endif // CHIP_TEST_THREAD_STACK_MGR_H
diff --git a/src/setup_payload/Base41.h b/src/setup_payload/Base41.h
index e3bd7cb..0a437a7 100644
--- a/src/setup_payload/Base41.h
+++ b/src/setup_payload/Base41.h
@@ -20,8 +20,7 @@
* Utility header to encode an input into a Base41 String
*/
-#ifndef _SETUP_CODE_UTILS_H_
-#define _SETUP_CODE_UTILS_H_
+#pragma once
#include <core/CHIPError.h>
@@ -35,5 +34,3 @@
std::string base41Encode(const uint8_t * buf, size_t buf_len);
} // namespace chip
-
-#endif /* _SETUP_CODE_UTILS_H_ */
diff --git a/src/setup_payload/ManualSetupPayloadGenerator.h b/src/setup_payload/ManualSetupPayloadGenerator.h
index ac7b3c6..362788a 100644
--- a/src/setup_payload/ManualSetupPayloadGenerator.h
+++ b/src/setup_payload/ManualSetupPayloadGenerator.h
@@ -31,8 +31,7 @@
*
*/
-#ifndef _MANUAL_SETUP_PAYLOAD_GENERATOR_H_
-#define _MANUAL_SETUP_PAYLOAD_GENERATOR_H_
+#pragma once
#include "SetupPayload.h"
@@ -55,5 +54,3 @@
};
} // namespace chip
-
-#endif // _MANUAL_SETUP_PAYLOAD_GENERATOR_H_
diff --git a/src/setup_payload/QRCodeSetupPayloadGenerator.h b/src/setup_payload/QRCodeSetupPayloadGenerator.h
index 94df435..512ea26 100644
--- a/src/setup_payload/QRCodeSetupPayloadGenerator.h
+++ b/src/setup_payload/QRCodeSetupPayloadGenerator.h
@@ -31,8 +31,7 @@
#include <string>
-#ifndef _QR_CODE_SETUP_PAYLOAD_GENERATOR_
-#define _QR_CODE_SETUP_PAYLOAD_GENERATOR_
+#pragma once
namespace chip {
@@ -89,5 +88,3 @@
};
} // namespace chip
-
-#endif /* _QR_CODE_SETUP_PAYLOAD_GENERATOR_ */
diff --git a/src/setup_payload/SetupPayload.h b/src/setup_payload/SetupPayload.h
index 5e945e2..479a7a5 100644
--- a/src/setup_payload/SetupPayload.h
+++ b/src/setup_payload/SetupPayload.h
@@ -21,8 +21,7 @@
* data enumerated from a byte stream
*/
-#ifndef _SETUP_PAYLOAD_H_
-#define _SETUP_PAYLOAD_H_
+#pragma once
#include <map>
#include <stdint.h>
@@ -242,5 +241,3 @@
};
} // namespace chip
-
-#endif /* _SETUP_PAYLOAD_H_ */
diff --git a/src/setup_payload/SetupPayloadHelper.h b/src/setup_payload/SetupPayloadHelper.h
index ff4502a..f70ecac 100644
--- a/src/setup_payload/SetupPayloadHelper.h
+++ b/src/setup_payload/SetupPayloadHelper.h
@@ -20,8 +20,7 @@
* The implementation of the Setup Payload Helper. To be used by the chip command line tool.
*/
-#ifndef SetupPayloadHelper_h
-#define SetupPayloadHelper_h
+#pragma once
#include <core/CHIPError.h>
#include <string>
@@ -32,5 +31,3 @@
CHIP_ERROR generateQRCodeFromFilePath(std::string filePath, std::string & outCode);
CHIP_ERROR generateManualCodeFromFilePath(std::string filePath, std::string & outCode);
} // namespace chip
-
-#endif /* SetupPayloadHelper_h */
diff --git a/src/setup_payload/tests/TestManualCode.h b/src/setup_payload/tests/TestManualCode.h
index ced1c00..fb9d998 100644
--- a/src/setup_payload/tests/TestManualCode.h
+++ b/src/setup_payload/tests/TestManualCode.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef TESTMANUALCODE_H
-#define TESTMANUALCODE_H
+#pragma once
int TestManualSetupCode();
-
-#endif // TESTMANUALCODE_H
diff --git a/src/setup_payload/tests/TestQRCode.h b/src/setup_payload/tests/TestQRCode.h
index 9632bd5..42f5896 100644
--- a/src/setup_payload/tests/TestQRCode.h
+++ b/src/setup_payload/tests/TestQRCode.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef TESTQRCODE_H
-#define TESTQRCODE_H
+#pragma once
int TestQuickResponseCode();
-
-#endif // TESTQRCODE_H
diff --git a/src/setup_payload/tests/TestQRCodeTLV.h b/src/setup_payload/tests/TestQRCodeTLV.h
index b86e085..68e5d5d 100644
--- a/src/setup_payload/tests/TestQRCodeTLV.h
+++ b/src/setup_payload/tests/TestQRCodeTLV.h
@@ -21,9 +21,6 @@
*
*/
-#ifndef TESTQRCODETLV_H
-#define TESTQRCODETLV_H
+#pragma once
int TestQRCodeTLV();
-
-#endif // TESTQRCODETLV_H
diff --git a/src/transport/PeerConnections.h b/src/transport/PeerConnections.h
index 5a06afd..139e7df 100644
--- a/src/transport/PeerConnections.h
+++ b/src/transport/PeerConnections.h
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef PEER_CONNECTIONS_H_
-#define PEER_CONNECTIONS_H_
+#pragma once
#include <core/CHIPError.h>
#include <support/CodeUtils.h>
@@ -318,5 +317,3 @@
} // namespace Transport
} // namespace chip
-
-#endif // PEER_CONNECTIONS_H_
diff --git a/src/transport/raw/MessageHeader.h b/src/transport/raw/MessageHeader.h
index 77c8976..16b16a8 100644
--- a/src/transport/raw/MessageHeader.h
+++ b/src/transport/raw/MessageHeader.h
@@ -20,8 +20,7 @@
* This file defines CHIP binary header encode/decode.
*/
-#ifndef MESSAGEHEADER_H_
-#define MESSAGEHEADER_H_
+#pragma once
#include <cstddef>
#include <cstdint>
@@ -447,5 +446,3 @@
};
} // namespace chip
-
-#endif // MESSAGEHEADER_H_
diff --git a/src/transport/raw/tests/NetworkTestHelpers.h b/src/transport/raw/tests/NetworkTestHelpers.h
index 80316d9..d8449f3 100644
--- a/src/transport/raw/tests/NetworkTestHelpers.h
+++ b/src/transport/raw/tests/NetworkTestHelpers.h
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef NETWORK_TEST_HELPERS_H_
-#define NETWORK_TEST_HELPERS_H_
+#pragma once
#include <functional>
@@ -59,5 +58,3 @@
} // namespace Test
} // namespace chip
-
-#endif // NETWORK_TEST_HELPERS_H_
diff --git a/src/transport/raw/tests/TestRawTransportLayer.h b/src/transport/raw/tests/TestRawTransportLayer.h
index 8e0924a..f53a203 100644
--- a/src/transport/raw/tests/TestRawTransportLayer.h
+++ b/src/transport/raw/tests/TestRawTransportLayer.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef TESTRAWTRANSPORTLAYER_H
-#define TESTRAWTRANSPORTLAYER_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -36,5 +35,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // TESTRAWTRANSPORTLAYER_H
diff --git a/src/transport/retransmit/tests/TestRetransmit.h b/src/transport/retransmit/tests/TestRetransmit.h
index 900c2dd..95a71e3 100644
--- a/src/transport/retransmit/tests/TestRetransmit.h
+++ b/src/transport/retransmit/tests/TestRetransmit.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef TESTRETRANSMIT_H
-#define TESTRETRANSMIT_H
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -27,5 +26,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // TESTRETRANSMIT_H
