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 6991279..3501ff2 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 c91ab2f..68895e6 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 a05c0aa..fa871eb 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 eb7c2e9..c3c5033 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 7de8114..9bc98c9 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 30e259f..2b255db 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 a065b19..fb3252e 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);