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

…h. (#11114) * 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. * Add PasscodeId.h Co-authored-by: Marc Lepage <67919234+mlepage-google@users.noreply.github.com> Co-authored-by: Marc Lepage <67919234+mlepage-google@users.noreply.github.com>
project-chip · Nov 22, 2021 · 1037904 · 1037904
1 parent 90ca1cd
commit 1037904
Show file tree

Hide file tree

Showing 2 changed files with 6 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,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>
+
 namespace chip {
 
 typedef uint8_t ActionId;