Skip to content

Commit

Permalink
Merge pull request #528 from nicklauslittle/vs-fix
Browse files Browse the repository at this point in the history
Fix Visual Studio compile issue
  • Loading branch information
tmontgomery authored Jul 29, 2018
2 parents cc487b6 + 5a7ffcb commit ee3bbab
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions aeron-client/src/main/cpp/concurrent/AgentRunner.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
#include <thread>
#include <atomic>
#include <concurrent/logbuffer/TermReader.h>
#include <pthread.h>

#if !defined(AERON_COMPILER_MSVC)
#include <pthread.h>
#endif

namespace aeron {

Expand Down Expand Up @@ -71,7 +73,8 @@ class AgentRunner
{
m_thread = std::thread([&]()
{
#if defined(Darwin)
#if defined(AERON_COMPILER_MSVC)
#elif defined(Darwin)
pthread_setname_np(m_name.c_str());
#else
pthread_setname_np(pthread_self(), m_name.c_str());
Expand Down

0 comments on commit ee3bbab

Please # to comment.