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

NodeId, GroupId, and VendorId declarations should come along when including a header called DataModelTypes.h.
project-chip · Oct 28, 2021 · a4d4f5d · a4d4f5d
1 parent 551ba65
commit a4d4f5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app/util/basic-types.h b/src/app/util/basic-types.h
@@ -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 {

diff --git a/src/lib/core/DataModelTypes.h b/src/lib/core/DataModelTypes.h
@@ -19,6 +19,10 @@
 
 #include <cstdint>
 
+#include <lib/core/CHIPVendorIdentifiers.hpp> // For VendorId
+#include <lib/core/GroupId.h>
+#include <lib/core/NodeId.h>
+
 namespace chip {
 
 typedef uint8_t ActionId;