Removed joinable()

Author: jvandenbroek

hardware/1Wire.cpp

@@ -89,13 +89,13 @@ bool C1Wire::StartHardware()
 
 bool C1Wire::StopHardware()
 {
-	if (m_threadSensors && m_threadSensors->joinable())
+	if (m_threadSensors)
 	{
 		m_stoprequested = true;
 		m_threadSensors->join();
 	}
 
-	if (m_threadSwitches && m_threadSwitches->joinable())
+	if (m_threadSwitches)
 	{
 		m_stoprequested = true;
 		m_threadSwitches->join();

hardware/1Wire/1WireByKernel.cpp

@@ -32,8 +32,7 @@ C1WireByKernel::C1WireByKernel()
 
 C1WireByKernel::~C1WireByKernel()
 {
-   if (m_thread->joinable())
-         m_thread->join();
+   m_thread->join();
 }
 
 bool C1WireByKernel::IsAvailable()

hardware/AccuWeather.cpp

@@ -73,12 +73,12 @@ bool CAccuWeather::StartHardware()
 	m_thread = std::shared_ptr<std::thread>(new std::thread(std::bind(&CAccuWeather::Do_Work, this)));
 	m_bIsStarted=true;
 	sOnConnected(this);
-	return (m_thread != NULL && m_thread->joinable());
+	return (m_thread != NULL);
 }
 
 bool CAccuWeather::StopHardware()
 {
-	if (m_thread != NULL && m_thread->joinable())
+	if (m_thread != NULL)
 	{
 		assert(m_thread);
 		m_stoprequested = true;

hardware/AnnaThermostat.cpp

@@ -77,12 +77,12 @@ bool CAnnaThermostat::StartHardware()
 	m_thread = std::shared_ptr<std::thread>(new std::thread(std::bind(&CAnnaThermostat::Do_Work, this)));
 	m_bIsStarted=true;
 	sOnConnected(this);
-	return (m_thread != NULL && m_thread->joinable());
+	return (m_thread != NULL);
 }
 
 bool CAnnaThermostat::StopHardware()
 {
-	if (m_thread != NULL && m_thread->joinable())
+	if (m_thread != NULL)
 	{
 		assert(m_thread);
 		m_stoprequested = true;

hardware/Arilux.cpp

@@ -59,7 +59,7 @@ bool Arilux::StopHardware()
 {
 	m_stoprequested = true;
 	try {
-		if (m_thread && m_thread->joinable())
+		if (m_thread)
 		{
 			m_thread->join();
 		}

hardware/AtagOne.cpp

@@ -98,12 +98,12 @@ bool CAtagOne::StartHardware()
 	m_thread = std::shared_ptr<std::thread>(new std::thread(std::bind(&CAtagOne::Do_Work, this)));
 	m_bIsStarted=true;
 	sOnConnected(this);
-	return (m_thread != NULL && m_thread->joinable());
+	return (m_thread != NULL);
 }
 
 bool CAtagOne::StopHardware()
 {
-	if (m_thread != NULL && m_thread->joinable())
+	if (m_thread != NULL)
 	{
 		assert(m_thread);
 		m_stoprequested = true;

hardware/BleBox.cpp

@@ -61,7 +61,7 @@ bool BleBox::StopHardware()
 {
 	m_stoprequested = true;
 
-	if (m_thread && m_thread->joinable())
+	if (m_thread)
 	{
 		m_thread->join();
 	}
@@ -1194,7 +1194,6 @@ void BleBox::SearchNodes(const std::string &ipmask)
 
 	for (size_t i = 1; i <= searchingThreads.size(); ++i)
 	{
-		if (searchingThreads[i - 1]->joinable())
-			searchingThreads[i - 1]->join();
+		searchingThreads[i - 1]->join();
 	}
 }

hardware/Comm5Serial.cpp

@@ -103,7 +103,7 @@ bool Comm5Serial::StopHardware()
 {
 	terminate();
 	m_stoprequested = true;
-	if (m_thread && m_thread->joinable())
+	if (m_thread)
 	{
 		m_thread->join();
 		// Wait a while. The read thread might be reading. Adding this prevents a pointer error in the async serial class.

hardware/CurrentCostMeterSerial.cpp

@@ -72,7 +72,7 @@ bool CurrentCostMeterSerial::StopHardware()
 {
 	terminate();
 	m_stoprequested = true;
-	if (m_thread && m_thread->joinable())
+	if (m_thread)
 	{
 		m_thread->join();
 		// Wait a while. The read thread might be reading. Adding this prevents a pointer error in the async serial class.

hardware/CurrentCostMeterTCP.cpp

@@ -57,7 +57,7 @@ bool CurrentCostMeterTCP::StartHardware()
 
 	//Start worker thread
 	m_thread = std::shared_ptr<std::thread>(new std::thread(std::bind(&CurrentCostMeterTCP::Do_Work, this)));
-	return (m_thread != NULL && m_thread->joinable());
+	return (m_thread != NULL);
 }
 
 bool CurrentCostMeterTCP::isConnected()