Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build.

Browse Source
This commit is contained in:
Peter Johnson
2015-12-20 20:55:36 -08:00
parent fb486e381f
commit 298dc54910
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/lib/NetworkTablesJNI.cpp
View File

@@ -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();
}