Skip to content

Commit

Permalink
Merge pull request #687 from rwalker-apple/sort-includes-ble
Browse files Browse the repository at this point in the history
sort includes ble
  • Loading branch information
BroderickCarlin authored May 14, 2020
2 parents 7a5a9c3 + deb51ed commit 244b866
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/ble/BLEEndPoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
#if CONFIG_NETWORK_LAYER_BLE
#include <core/CHIPConfig.h>

#include <support/logging/CHIPLogging.h>
#include <support/CHIPFaultInjection.h>
#include <support/CodeUtils.h>
#include <support/FlagUtils.hpp>
#include <support/CHIPFaultInjection.h>
#include <support/logging/CHIPLogging.h>

#include <ble/BLEEndPoint.h>
#include <ble/BleLayer.h>
Expand Down
4 changes: 2 additions & 2 deletions src/ble/Ble.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
#ifndef CHIP_BLE_H
#define CHIP_BLE_H

#include <ble/BleApplicationDelegate.h>
#include <ble/BleConfig.h>

#include <ble/BLEEndPoint.h>
#include <ble/BleApplicationDelegate.h>
#include <ble/BleError.h>
#include <ble/Ble.h>
#include <ble/BleLayer.h>
#include <ble/BlePlatformDelegate.h>
#include <ble/BleUUID.h>
Expand Down
4 changes: 2 additions & 2 deletions src/ble/BleApplicationDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#ifndef BLEAPPLICATIONDELEGATE_H_
#define BLEAPPLICATIONDELEGATE_H_

#include <support/DLLUtil.h>
#include <ble/BleConfig.h>

#include "BleConfig.h"
#include <support/DLLUtil.h>

namespace chip {
namespace Ble {
Expand Down
2 changes: 1 addition & 1 deletion src/ble/BleError.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#if CONFIG_NETWORK_LAYER_BLE

#include <ble/BleLayer.h>
#include <ble/BleError.h>
#include <ble/BleLayer.h>

#include <support/ErrorStr.h>

Expand Down
6 changes: 3 additions & 3 deletions src/ble/BleLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@

#include <string.h>

#include <ble/BlePlatformDelegate.h>
#include <ble/BLEEndPoint.h>
#include <ble/BleApplicationDelegate.h>
#include <ble/BleLayer.h>
#include <ble/BlePlatformDelegate.h>
#include <ble/BleUUID.h>
#include <ble/BLEEndPoint.h>

#include <core/CHIPEncoding.h>
#include <support/logging/CHIPLogging.h>
#include <support/CodeUtils.h>
#include <support/logging/CHIPLogging.h>

// clang-format off

Expand Down
4 changes: 2 additions & 2 deletions src/ble/BleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
#include <system/SystemLayer.h>
#include <system/SystemPacketBuffer.h>

#include <ble/BlePlatformDelegate.h>
#include <ble/BleApplicationDelegate.h>
#include <ble/BleUUID.h>
#include <ble/BleError.h>
#include <ble/BlePlatformDelegate.h>
#include <ble/BleUUID.h>

#if BLE_CONFIG_PROVIDE_OBSOLESCENT_INTERFACES
#include <inet/InetLayer.h>
Expand Down
2 changes: 1 addition & 1 deletion src/ble/BlePlatformDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

#include <ble/BleUUID.h>

#include <system/SystemPacketBuffer.h>
#include <support/DLLUtil.h>
#include <system/SystemPacketBuffer.h>

namespace chip {
namespace Ble {
Expand Down
2 changes: 1 addition & 1 deletion src/ble/BtpEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include <ble/BtpEngineTest.h>
#endif

#include <support/logging/CHIPLogging.h>
#include <support/CodeUtils.h>
#include <support/logging/CHIPLogging.h>

// Define below to enable extremely verbose BLE-specific debug logging.
#undef CHIP_BTP_PROTOCOL_ENGINE_DEBUG_LOGGING_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion src/ble/BtpEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#include <ble/BleConfig.h>

#include <ble/BleError.h>
#include <system/SystemPacketBuffer.h>
#include <support/FlagUtils.hpp>
#include <system/SystemPacketBuffer.h>

namespace chip {
namespace Ble {
Expand Down

0 comments on commit 244b866

Please sign in to comment.