Reorder includes to avoid redifinition warnings in PAL

PAL headers should come before any standard C++ headers.

diff --git a/src/debug/netcoredbg/frames.h b/src/debug/netcoredbg/frames.h
index 69912793b3c13901076b880a5ab8df3d587194fc..3501ff2b6fadc55ef3c7dcd226487a8e12052fd3 100644 (file)
--- a/src/debug/netcoredbg/frames.h
+++ b/src/debug/netcoredbg/frames.h
@@ -3,11 +3,11 @@
 // See the LICENSE file in the project root for more information.
 #pragma once
 
-#include <vector>
-
 #include <cor.h>
 #include <cordebug.h>
 
+#include <vector>
+
 struct Thread;
 
 HRESULT GetFrameAt(ICorDebugThread *pThread, int level, ICorDebugFrame **ppFrame);

diff --git a/src/debug/netcoredbg/manageddebugger.h b/src/debug/netcoredbg/manageddebugger.h
index c91ab2f08ae0a9d30a5a3a4d3a4581b3d597b1af..68895e6e031bb726dfc5da31e4a31b834e38142f 100644 (file)
--- a/src/debug/netcoredbg/manageddebugger.h
+++ b/src/debug/netcoredbg/manageddebugger.h
@@ -3,15 +3,16 @@
 // See the LICENSE file in the project root for more information.
 #pragma once
 
+#include "modules.h"
+#include "debugger.h"
+#include "protocol.h"
+
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 #include <condition_variable>
 #include <future>
 
-#include "debugger.h"
-#include "protocol.h"
-#include "modules.h"
 
 
 enum ValueKind

diff --git a/src/debug/netcoredbg/miprotocol.cpp b/src/debug/netcoredbg/miprotocol.cpp
index a05c0aae62af128a1343e49caed641994295d571..fa871ebb3cfd20398078efe68b151c1aec5a79e1 100644 (file)
--- a/src/debug/netcoredbg/miprotocol.cpp
+++ b/src/debug/netcoredbg/miprotocol.cpp
@@ -2,6 +2,9 @@
 // Distributed under the MIT License.
 // See the LICENSE file in the project root for more information.
 
+#include "frames.h"
+#include "platform.h"
+#include "torelease.h"
 #include "miprotocol.h"
 
 #include <sstream>
@@ -10,9 +13,6 @@
 #include <iostream>
 #include <iomanip>
 
-#include "frames.h"
-#include "platform.h"
-#include "torelease.h"
 
 
 using namespace std::placeholders;

diff --git a/src/debug/netcoredbg/modules.h b/src/debug/netcoredbg/modules.h
index eb7c2e9e1e43e2b36f6c19ff7c596afb204282af..c3c50334d731f144c5b5189fea2715a57a359150 100644 (file)
--- a/src/debug/netcoredbg/modules.h
+++ b/src/debug/netcoredbg/modules.h
@@ -4,14 +4,14 @@
 
 #pragma once
 
+#include <cor.h>
+#include <cordebug.h>
+
 #include <functional>
 #include <unordered_map>
 #include <mutex>
 #include <memory>
 
-#include <cor.h>
-#include <cordebug.h>
-
 #include "protocol.h"
 #include "torelease.h"
 

diff --git a/src/debug/netcoredbg/symbolreader.h b/src/debug/netcoredbg/symbolreader.h
index 7de8114aee8ec1331da18d364555c4e4ba636f5b..9bc98c92e2ece18afed5febab7dd7495c6880cc0 100644 (file)
--- a/src/debug/netcoredbg/symbolreader.h
+++ b/src/debug/netcoredbg/symbolreader.h
@@ -5,11 +5,12 @@
 // Copyright (c) 2017 Samsung Electronics Co., LTD
 #pragma once
 
+#include <cor.h>
+#include <cordebug.h>
+
 #include <string>
 #include <vector>
 
-#include <cor.h>
-#include <cordebug.h>
 
 /// FIXME: Definition of `TADDR`
 #include "torelease.h"

diff --git a/src/debug/netcoredbg/typeprinter.h b/src/debug/netcoredbg/typeprinter.h
index 30e259ffdf00b44f7381ed0dfcb08db2295b544a..2b255db1e98e285046c6d436f12d5d5ceaa6df03 100644 (file)
--- a/src/debug/netcoredbg/typeprinter.h
+++ b/src/debug/netcoredbg/typeprinter.h
@@ -3,12 +3,13 @@
 // See the LICENSE file in the project root for more information.
 #pragma once
 
+#include <cor.h>
+#include <cordebug.h>
+
 #include <list>
 #include <string>
 #include <vector>
 
-#include <cor.h>
-#include <cordebug.h>
 
 class TypePrinter
 {

diff --git a/src/debug/netcoredbg/valueprint.h b/src/debug/netcoredbg/valueprint.h
index a065b193c67a484408baf4e44d4a87dc91cd17bc..fb3252e3e0a3f980cb29d156cfbd1e93334c5914 100644 (file)
--- a/src/debug/netcoredbg/valueprint.h
+++ b/src/debug/netcoredbg/valueprint.h
@@ -3,10 +3,10 @@
 // See the LICENSE file in the project root for more information.
 #pragma once
 
-#include <string>
-
 #include <cor.h>
 #include <cordebug.h>
 
+#include <string>
+
 HRESULT PrintValue(ICorDebugValue *pInputValue, std::string &output, bool escape = true);
 HRESULT DereferenceAndUnboxValue(ICorDebugValue * pValue, ICorDebugValue** ppOutputValue, BOOL * pIsNull = nullptr);