Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the lib/core type includes from basic_types.h to DataModelTypes.h. #11114

Merged
merged 2 commits into from
Oct 28, 2021
Merged

Move the lib/core type includes from basic_types.h to DataModelTypes.h. #11114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e62b4f
Move the lib/core type includes from basic_types.h to DataModelTypes.h.
bzbarsky-apple Oct 28, 2021
109663d
Add PasscodeId.h
bzbarsky-apple Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/app/util/basic-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@

#include <cstdint>

#include <lib/core/GroupId.h>
#include <lib/core/NodeId.h>

// Pull in other core types
#include <lib/core/CHIPVendorIdentifiers.hpp>
// Pull in core types
#include <lib/core/DataModelTypes.h>

namespace chip {
Expand Down
5 changes: 5 additions & 0 deletions src/lib/core/DataModelTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@

#include <cstdint>

#include <lib/core/CHIPVendorIdentifiers.hpp> // For VendorId
#include <lib/core/GroupId.h>
#include <lib/core/NodeId.h>
#include <lib/core/PasscodeId.h>

bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
namespace chip {

typedef uint8_t ActionId;
Expand Down