Author: labath
Date: Wed Sep 7 03:46:50 2016
New Revision: 280793
URL: http://llvm.org/viewvc/llvm-project?rev=280793&view=rev
Log:
Fix unittest compilation on windows
After the reformat, the unittests do not compile due to missing due to
redefinition errors
between PosixApi.h and ucrt/direct.h. This is a bit of a shot in the dark, as I
have not tested
it on windows, but I am restoring the original include order, so it should
hopefully fix it.
Modified:
lldb/trunk/unittests/Host/SymbolsTest.cpp
lldb/trunk/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp
lldb/trunk/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
lldb/trunk/unittests/Process/gdb-remote/GDBRemoteTestUtils.h
Modified: lldb/trunk/unittests/Host/SymbolsTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Host/SymbolsTest.cpp?rev=280793&r1=280792&r2=280793&view=diff
==============================================================================
--- lldb/trunk/unittests/Host/SymbolsTest.cpp (original)
+++ lldb/trunk/unittests/Host/SymbolsTest.cpp Wed Sep 7 03:46:50 2016
@@ -7,9 +7,10 @@
//
//===----------------------------------------------------------------------===//
+#include "gtest/gtest.h"
+
#include "lldb/Host/Symbols.h"
#include "lldb/Core/ModuleSpec.h"
-#include "gtest/gtest.h"
using namespace lldb_private;
Modified: lldb/trunk/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp?rev=280793&r1=280792&r2=280793&view=diff
==============================================================================
--- lldb/trunk/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp
(original)
+++ lldb/trunk/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp Wed Sep
7 03:46:50 2016
@@ -16,7 +16,6 @@
#include <future>
#include "GDBRemoteTestUtils.h"
-#include "gtest/gtest.h"
#include "Plugins/Process/Utility/LinuxSignals.h"
#include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h"
Modified:
lldb/trunk/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp?rev=280793&r1=280792&r2=280793&view=diff
==============================================================================
---
lldb/trunk/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
(original)
+++
lldb/trunk/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
Wed Sep 7 03:46:50 2016
@@ -16,7 +16,6 @@
#include <future>
#include "GDBRemoteTestUtils.h"
-#include "gtest/gtest.h"
#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h"
#include "lldb/Core/DataBuffer.h"
Modified: lldb/trunk/unittests/Process/gdb-remote/GDBRemoteTestUtils.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Process/gdb-remote/GDBRemoteTestUtils.h?rev=280793&r1=280792&r2=280793&view=diff
==============================================================================
--- lldb/trunk/unittests/Process/gdb-remote/GDBRemoteTestUtils.h (original)
+++ lldb/trunk/unittests/Process/gdb-remote/GDBRemoteTestUtils.h Wed Sep 7
03:46:50 2016
@@ -9,9 +9,10 @@
#ifndef lldb_unittests_Process_gdb_remote_GDBRemoteTestUtils_h
#define lldb_unittests_Process_gdb_remote_GDBRemoteTestUtils_h
-#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h"
#include "gtest/gtest.h"
+#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h"
+
namespace lldb_private {
namespace process_gdb_remote {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
