Merge pull request OpenLightingProject#2013 from peternewman/master-resync

Master resync

Author: peternewman

.codespellignorelines

@@ -62,7 +62,7 @@ const uint8_t BaseRobeWidget::SOM;
         /^(?:([0-9]{1,3})(?:\s(THRU)\s(?:([0-9]{1,3}))?)?(?:\s(@)\s(?:([0-9]{1,3}|FULL))?)?)/;
             $scope.input(' THRU ');
   manufacturer_name: "ALS Stanislaw Binkiewicz"
-  manufacturer_name: "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""
+  manufacturer_name: "EK INC (formerly Guangzhou Litewise Lighting Equipments Co., Ltd.)"
   manufacturer_name: "Guangzhou VAS Lighting Co., Ltd."
   manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
   manufacturer_name: "MEDIAM Ltd. (Modus brand)"

common/io/SelectServerTest.cpp

@@ -122,7 +122,9 @@ class SelectServerTest: public CppUnit::TestFixture {
 
   void Terminate() {
     OLA_DEBUG << "Terminate called";
-    if (m_ss) { m_ss->Terminate(); }
+    if (m_ss) {
+      m_ss->Terminate();
+    }
   }
 
   void SingleIncrementTimeout() {
@@ -147,8 +149,9 @@ class SelectServerTest: public CppUnit::TestFixture {
   void NullHandler() {}
 
   bool IncrementTimeout() {
-    if (m_ss && m_ss->IsRunning())
+    if (m_ss && m_ss->IsRunning()) {
       m_timeout_counter++;
+    }
     return true;
   }
 

common/testing/GenericTester.cpp

@@ -25,6 +25,7 @@
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+#include <iostream>
 #include <string>
 
 #include "ola/base/Env.h"

doxygen/examples/callback_client_transmit.cpp

@@ -22,6 +22,8 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;
 

doxygen/examples/client_disconnect.cpp

@@ -23,6 +23,8 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;
 

doxygen/examples/client_thread.cpp

@@ -22,6 +22,7 @@
 #include <ola/thread/Thread.h>
 #include <ola/Callback.h>
 
+#include <iostream>
 #include <vector>
 
 #ifdef _WIN32

doxygen/examples/fetch_plugins.cpp

@@ -21,6 +21,7 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
 #include <vector>
 
 using std::cout;

doxygen/examples/legacy_callback_client_transmit.cpp

@@ -22,6 +22,8 @@
 #include <ola/OlaClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;
 

examples/ola-dmxconsole.cpp

@@ -56,6 +56,7 @@
 #include <ola/client/OlaClient.h>
 #include <ola/io/SelectServer.h>
 
+#include <iostream>
 #include <string>
 
 using ola::client::OlaClient;

include/ola/thread/FuturePrivate.h

@@ -89,7 +89,7 @@ class FutureImpl {
   bool m_is_set;
   T m_value;
 
-  DISALLOW_COPY_AND_ASSIGN(FutureImpl<T>);
+  DISALLOW_COPY_AND_ASSIGN(FutureImpl);
 };
 
 /**
@@ -152,7 +152,7 @@ class FutureImpl<void> {
   unsigned int m_ref_count;
   bool m_is_set;
 
-  DISALLOW_COPY_AND_ASSIGN(FutureImpl<void>);
+  DISALLOW_COPY_AND_ASSIGN(FutureImpl);
 };
 
 }  // namespace thread