espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-15 13:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build warnings and breaks (#690)

Browse Source
This commit is contained in:
Nick Banks
2016-09-26 14:20:53 -07:00
committed by Jonathan Hui
parent 615102a51f
commit 2071716936
6 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/visual-studio/libopenthread.vcxproj
+4
View File
@@ -66,6 +66,8 @@
<ClCompile Include="..\..\src\core\thread\network_data.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_leader.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag_tlvs.cpp" />
<ClCompile Include="..\..\src\core\thread\panid_query_server.cpp" />
<ClCompile Include="..\..\src\core\thread\thread_netif.cpp" />
<ClCompile Include="..\..\src\core\thread\thread_tlvs.cpp" />
@@ -126,6 +128,8 @@
<ClInclude Include="..\..\src\core\thread\network_data_leader.hpp" />
<ClInclude Include="..\..\src\core\thread\network_data_local.hpp" />
<ClInclude Include="..\..\src\core\thread\network_data_tlvs.hpp" />
<ClInclude Include="..\..\src\core\thread\network_diag.hpp" />
<ClInclude Include="..\..\src\core\thread\network_diag_tlvs.hpp" />
<ClInclude Include="..\..\src\core\thread\panid_query_server.hpp" />
<ClInclude Include="..\..\src\core\thread\thread_netif.hpp" />
<ClInclude Include="..\..\src\core\thread\thread_tlvs.hpp" />
etc/visual-studio/libopenthread.vcxproj.filters
+12
View File
@@ -141,6 +141,12 @@
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_diag.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_diag_tlvs.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\panid_query_server.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
@@ -323,6 +329,12 @@
<ClInclude Include="..\..\src\core\thread\network_data_tlvs.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\thread\network_diag.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\thread\network_diag_tlvs.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\thread\panid_query_server.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
etc/visual-studio/libopenthread_k.vcxproj
+4
View File
@@ -66,6 +66,8 @@
<ClCompile Include="..\..\src\core\thread\network_data.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_leader.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag_tlvs.cpp" />
<ClCompile Include="..\..\src\core\thread\panid_query_server.cpp" />
<ClCompile Include="..\..\src\core\thread\thread_netif.cpp" />
<ClCompile Include="..\..\src\core\thread\thread_tlvs.cpp" />
@@ -126,6 +128,8 @@
<ClInclude Include="..\..\src\core\thread\network_data_leader.hpp" />
<ClInclude Include="..\..\src\core\thread\network_data_local.hpp" />
<ClInclude Include="..\..\src\core\thread\network_data_tlvs.hpp" />
<ClInclude Include="..\..\src\core\thread\network_diag.hpp" />
<ClInclude Include="..\..\src\core\thread\network_diag_tlvs.hpp" />
<ClInclude Include="..\..\src\core\thread\panid_query_server.hpp" />
<ClInclude Include="..\..\src\core\thread\thread_netif.hpp" />
<ClInclude Include="..\..\src\core\thread\thread_tlvs.hpp" />
etc/visual-studio/libopenthread_k.vcxproj.filters
+12
View File
@@ -141,6 +141,12 @@
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_diag.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_diag_tlvs.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\panid_query_server.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
@@ -323,6 +329,12 @@
<ClInclude Include="..\..\src\core\thread\network_data_tlvs.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\thread\network_diag.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\thread\network_diag_tlvs.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\thread\panid_query_server.hpp">
<Filter>Header Files\thread</Filter>
</ClInclude>
include/openthread-windows-config.h
+2
View File
@@ -77,5 +77,7 @@
#define _CRT_SECURE_NO_WARNINGS
// Disable a few warnings that we don't care about
#pragma warning(disable:4200) // nonstandard extension used: zero-sized array in struct/union
#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union
#pragma warning(disable:4291) // no matching operator delete found
#pragma warning(disable:4815) // zero-sized array in stack object will have no elements
src/core/thread/network_diag.cpp
+4 -4
View File
@@ -54,8 +54,8 @@ namespace Thread {
namespace NetworkDiagnostic {
NetworkDiagnostic::NetworkDiagnostic(ThreadNetif &aThreadNetif) :
mDiagnosticGet(OPENTHREAD_URI_DIAGNOSTIC_GET, &HandleDiagnosticGet, this),
mDiagnosticReset(OPENTHREAD_URI_DIAGNOSTIC_RESET, &HandleDiagnosticReset, this),
mDiagnosticGet(OPENTHREAD_URI_DIAGNOSTIC_GET, &NetworkDiagnostic::HandleDiagnosticGet, this),
mDiagnosticReset(OPENTHREAD_URI_DIAGNOSTIC_RESET, &NetworkDiagnostic::HandleDiagnosticReset, this),
mSocket(aThreadNetif.GetIp6().mUdp),
mCoapServer(aThreadNetif.GetCoapServer()),
mMle(aThreadNetif.GetMle()),
@@ -75,7 +75,7 @@ ThreadError NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address &aDestinatio
Ip6::MessageInfo messageInfo;
sockaddr.mPort = kCoapUdpPort;
mSocket.Open(&HandleUdpReceive, this);
mSocket.Open(&NetworkDiagnostic::HandleUdpReceive, this);
mSocket.Bind(sockaddr);
VerifyOrExit((message = mSocket.NewMessage(0)) != NULL, error = kThreadError_NoBufs);
@@ -150,7 +150,7 @@ ThreadError NetworkDiagnostic::SendDiagnosticReset(const Ip6::Address &aDestinat
Ip6::MessageInfo messageInfo;
sockaddr.mPort = kCoapUdpPort;
mSocket.Open(&HandleUdpReceive, this);
mSocket.Open(&NetworkDiagnostic::HandleUdpReceive, this);
mSocket.Bind(sockaddr);
VerifyOrExit((message = mSocket.NewMessage(0)) != NULL, error = kThreadError_NoBufs);