From 298dc5491048f1162afd221ec728428c8c7a19cb Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 20 Dec 2015 20:55:36 -0800 Subject: [PATCH] Fix Windows build. --- java/lib/NetworkTablesJNI.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/lib/NetworkTablesJNI.cpp b/java/lib/NetworkTablesJNI.cpp index 7dbf42b29d..feb09b3e8c 100644 --- a/java/lib/NetworkTablesJNI.cpp +++ b/java/lib/NetworkTablesJNI.cpp @@ -1288,6 +1288,7 @@ class LoggerThreadJNI { ATOMIC_STATIC(LoggerThreadJNI, instance); return instance; } + LoggerThreadJNI(); ~LoggerThreadJNI(); void SetFunc(JNIEnv* env, jobject func, jmethodID mid); void Start(); @@ -1302,7 +1303,7 @@ class LoggerThreadJNI { std::thread m_thread; std::mutex m_mutex; std::condition_variable m_cond; - std::atomic_bool m_active{false}; + std::atomic_bool m_active; struct LogMessage { LogMessage(unsigned int level_, const char* file_, unsigned int line_, const char* msg_) @@ -1322,6 +1323,10 @@ class LoggerThreadJNI { ATOMIC_STATIC_DECL(LoggerThreadJNI) }; +LoggerThreadJNI::LoggerThreadJNI() { + m_active = false; +} + LoggerThreadJNI::~LoggerThreadJNI() { Stop(); }