From 832b39471512fa9543f981053573fb6b3342a396 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Fri, 22 Dec 2017 18:25:46 +0000 Subject: Fix Travis build (#4101) Stop using gdb on osx - was breaking the build Add clang 3.5 build as travis now defaults to 5.0 Fix unknown-warning-option errors on AppleClang ProtoProxy: Use nullptr UrlClientTest: add override to callback destructor Update jsoncpp to use nullptr --- Tools/ProtoProxy/Connection.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Tools/ProtoProxy') diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index 1f765340f..a9fbe163e 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -190,7 +190,7 @@ struct sChunkMeta cConnection::cConnection(SOCKET a_ClientSocket, cServer & a_Server) : m_ItemIdx(0), - m_LogFile(NULL), + m_LogFile(nullptr), m_Server(a_Server), m_ClientSocket(a_ClientSocket), m_ServerSocket(-1), @@ -252,7 +252,7 @@ void cConnection::Run(void) FD_SET(m_ServerSocket, &ReadFDs); FD_SET(m_ClientSocket, &ReadFDs); SOCKET MaxSocket = std::max(m_ServerSocket, m_ClientSocket); - int res = select(MaxSocket + 1, &ReadFDs, NULL, NULL, NULL); + int res = select(MaxSocket + 1, &ReadFDs, nullptr, nullptr, nullptr); if (res <= 0) { printf("select() failed: %d; aborting client", SocketError); @@ -2571,7 +2571,7 @@ bool cConnection::HandleServerUpdateTileEntity(void) AString fnam; Printf(fnam, "%s_tile_%08x.nbt", m_LogNameBase.c_str(), m_ItemIdx++); FILE * f = fopen(fnam.c_str(), "wb"); - if (f != NULL) + if (f != nullptr) { fwrite(Data.data(), 1, Data.size(), f); fclose(f); @@ -2730,7 +2730,7 @@ bool cConnection::ParseSlot(cByteBuffer & a_Buffer, AString & a_ItemDesc) AString fnam; Printf(fnam, "%s_item_%08x.nbt", m_LogNameBase.c_str(), m_ItemIdx++); FILE * f = fopen(fnam.c_str(), "wb"); - if (f != NULL) + if (f != nullptr) { fwrite(Metadata.data(), 1, Metadata.size(), f); fclose(f); -- cgit v1.2.3