Commit 69ae93f6 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

merge upstream changes from libfnord

parent 81cbc362

src/libfnord/fnord-base/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ find_package(Threads) 
if(APPLE)

  set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ ${CMAKE_CXX_FLAGS}")

else()

  set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")

  set(CMAKE_CXX_FLAGS "-std=c++0x -pthread ${CMAKE_CXX_FLAGS}")

endif()



# base

src/libfnord/fnord-base/net/tcpserver.cc

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ void TCPServer::listen(int port) { 
    return;

  }



  opt = 1;

  if (setsockopt(ssock_, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {

    RAISE_ERRNO(kIOError, "setsockopt(SO_REUSEPORT) failed");

    return;

  }



  int flags = fcntl(ssock_, F_GETFL, 0);

  flags = flags | O_NONBLOCK;

src/libfnord/fnord-base/stdtypes.h

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <list>

#include <memory>

#include <mutex>

#include <set>

#include <stack>

#include <string>

#include <unordered_map>
@@ -35,6 +36,9 @@ using ScopedLock = std::unique_lock<T>; 
template <typename T>

using Vector = std::vector<T>;



template <typename T>

using Set = std::set<T>;



template <typename T>

using List = std::list<T>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE