From 265761220b1e6b9f596de62078282b3cb83f097d Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Tue, 12 Apr 2022 17:48:19 +0000 Subject: [PATCH] Fix build/include_order in include/dawn. This CL moves a couple of the import statements around in order to make the build/include_order lint pass in include/dawn. Bug: dawn:1339 Change-Id: I0570d150e938ebd27beda3d9d1516491344999b2 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86444 Auto-Submit: Dan Sinclair Reviewed-by: Corentin Wallez Commit-Queue: Dan Sinclair --- include/dawn/CPPLINT.cfg | 1 - include/dawn/platform/DawnPlatform.h | 4 ++-- include/dawn/wire/WireClient.h | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/dawn/CPPLINT.cfg b/include/dawn/CPPLINT.cfg index c2e9bca07b..bbf66f3978 100644 --- a/include/dawn/CPPLINT.cfg +++ b/include/dawn/CPPLINT.cfg @@ -1,3 +1,2 @@ -filter=-build/include_order filter=-readability/inheritance filter=-runtime/indentation_namespace diff --git a/include/dawn/platform/DawnPlatform.h b/include/dawn/platform/DawnPlatform.h index 0ace9f883b..1112a88b32 100644 --- a/include/dawn/platform/DawnPlatform.h +++ b/include/dawn/platform/DawnPlatform.h @@ -15,13 +15,13 @@ #ifndef INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_ #define INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_ -#include "dawn/platform/dawn_platform_export.h" +#include #include #include #include -#include +#include "dawn/platform/dawn_platform_export.h" namespace dawn::platform { diff --git a/include/dawn/wire/WireClient.h b/include/dawn/wire/WireClient.h index 7771188759..a493532ff0 100644 --- a/include/dawn/wire/WireClient.h +++ b/include/dawn/wire/WireClient.h @@ -15,12 +15,12 @@ #ifndef INCLUDE_DAWN_WIRE_WIRECLIENT_H_ #define INCLUDE_DAWN_WIRE_WIRECLIENT_H_ -#include "dawn/dawn_proc_table.h" -#include "dawn/wire/Wire.h" - #include #include +#include "dawn/dawn_proc_table.h" +#include "dawn/wire/Wire.h" + namespace dawn::wire { namespace client {