[ML] Standardise on not using explicit void argument lists (#34)

We've started mixing explicit void and empty argument lists. For C++ they are equivalent. If we 
needed C headers for any of our existing functionality we'd almost certainly have to provide a 
wrapper API anyway. Therefore, this change switches to empty argument lists on the grounds 
that it is less typing.

Author: tveasey

bin/controller/CBlockingCallCancellerThread.cc

@@ -33,7 +33,7 @@ CBlockingCallCancellerThread::CBlockingCallCancellerThread(core::CThread::TThrea
 {
 }
 
-void CBlockingCallCancellerThread::run(void)
+void CBlockingCallCancellerThread::run()
 {
     char c;
     while (m_MonitorStream >> c)
@@ -51,7 +51,7 @@ void CBlockingCallCancellerThread::run(void)
     }
 }
 
-void CBlockingCallCancellerThread::shutdown(void)
+void CBlockingCallCancellerThread::shutdown()
 {
     m_Shutdown = true;
 

bin/controller/CBlockingCallCancellerThread.h

@@ -53,10 +53,10 @@ class CBlockingCallCancellerThread : public core::CThread
 
     protected:
         //! Called when the thread is started.
-        virtual void run(void);
+        virtual void run();
 
         //! Called when the thread is stopped.
-        virtual void shutdown(void);
+        virtual void shutdown();
 
     private:
         //! Thread ID of the thread that this object will cancel blocking IO in

bin/controller/unittest/CBlockingCallCancellerThreadTest.cc

@@ -36,14 +36,14 @@ class CEofThread : public ml::core::CThread
         }
 
     protected:
-        virtual void run(void)
+        virtual void run()
         {
             ml::core::CSleep::sleep(200);
 
             m_Buf.signalEndOfFile();
         }
 
-        virtual void shutdown(void)
+        virtual void shutdown()
         {
         }
 
@@ -64,7 +64,7 @@ CppUnit::Test *CBlockingCallCancellerThreadTest::suite()
     return suiteOfTests;
 }
 
-void CBlockingCallCancellerThreadTest::testCancelBlock(void)
+void CBlockingCallCancellerThreadTest::testCancelBlock()
 {
     ml::core::CDualThreadStreamBuf buf;
     std::istream monStrm(&buf);

bin/controller/unittest/CBlockingCallCancellerThreadTest.h

@@ -20,7 +20,7 @@
 class CBlockingCallCancellerThreadTest : public CppUnit::TestFixture
 {
     public:
-        void testCancelBlock(void);
+        void testCancelBlock();
 
         static CppUnit::Test *suite();
 };

bin/controller/unittest/CCommandProcessorTest.cc

@@ -77,7 +77,7 @@ CppUnit::Test *CCommandProcessorTest::suite()
     return suiteOfTests;
 }
 
-void CCommandProcessorTest::testStartPermitted(void)
+void CCommandProcessorTest::testStartPermitted()
 {
     // Remove any output file left behind by a previous failed test, but don't
     // check the return code as this will usually fail
@@ -112,7 +112,7 @@ void CCommandProcessorTest::testStartPermitted(void)
     CPPUNIT_ASSERT_EQUAL(0, ::remove(OUTPUT_FILE.c_str()));
 }
 
-void CCommandProcessorTest::testStartNonPermitted(void)
+void CCommandProcessorTest::testStartNonPermitted()
 {
     ml::controller::CCommandProcessor::TStrVec permittedPaths(1, "some other process");
     ml::controller::CCommandProcessor processor(permittedPaths);
@@ -141,7 +141,7 @@ void CCommandProcessorTest::testStartNonPermitted(void)
     CPPUNIT_ASSERT_EQUAL(SLOGAN2, content);
 }
 
-void CCommandProcessorTest::testStartNonExistent(void)
+void CCommandProcessorTest::testStartNonExistent()
 {
     ml::controller::CCommandProcessor::TStrVec permittedPaths(1, "some other process");
     ml::controller::CCommandProcessor processor(permittedPaths);
@@ -152,7 +152,7 @@ void CCommandProcessorTest::testStartNonExistent(void)
     CPPUNIT_ASSERT(!processor.handleCommand(command));
 }
 
-void CCommandProcessorTest::testKillDisallowed(void)
+void CCommandProcessorTest::testKillDisallowed()
 {
     // Attempt to kill a process that exists but isn't allowed to be killed,
     // namely the unit test program
@@ -167,7 +167,7 @@ void CCommandProcessorTest::testKillDisallowed(void)
     CPPUNIT_ASSERT(!processor.handleCommand(command));
 }
 
-void CCommandProcessorTest::testInvalidVerb(void)
+void CCommandProcessorTest::testInvalidVerb()
 {
     ml::controller::CCommandProcessor::TStrVec permittedPaths(1, "some other process");
     ml::controller::CCommandProcessor processor(permittedPaths);

bin/controller/unittest/CCommandProcessorTest.h

@@ -20,11 +20,11 @@
 class CCommandProcessorTest : public CppUnit::TestFixture
 {
     public:
-        void testStartPermitted(void);
-        void testStartNonPermitted(void);
-        void testStartNonExistent(void);
-        void testKillDisallowed(void);
-        void testInvalidVerb(void);
+        void testStartPermitted();
+        void testStartNonPermitted();
+        void testStartNonExistent();
+        void testKillDisallowed();
+        void testInvalidVerb();
 
         static CppUnit::Test *suite();
 };

include/api/CAnomalyJob.h

@@ -180,20 +180,20 @@ class API_EXPORT CAnomalyJob : public CDataProcessor
                          const std::string &timeFieldFormat = EMPTY_STRING,
                          size_t maxAnomalyRecords = 0u);
 
-        virtual ~CAnomalyJob(void);
+        virtual ~CAnomalyJob();
 
         //! We're going to be writing to a new output stream
-        virtual void newOutputStream(void);
+        virtual void newOutputStream();
 
         //! Access the output handler
-        virtual COutputHandler &outputHandler(void);
+        virtual COutputHandler &outputHandler();
 
         //! Receive a single record to be processed, and produce output
         //! with any required modifications
         virtual bool handleRecord(const TStrStrUMap &dataRowFields);
 
         //! Perform any final processing once all input data has been seen.
-        virtual void finalise(void);
+        virtual void finalise();
 
         //! Restore previously saved state
         virtual bool restoreState(core::CDataSearcher &restoreSearcher,
@@ -206,13 +206,13 @@ class API_EXPORT CAnomalyJob : public CDataProcessor
         virtual bool initNormalizer(const std::string &quantilesStateFile);
 
         //! How many records did we handle?
-        virtual uint64_t numRecordsHandled(void) const;
+        virtual uint64_t numRecordsHandled() const;
 
         //! Log a list of the detectors and keys
-        void description(void) const;
+        void description() const;
 
         //! Log a list of the detectors, keys and their memory usage
-        void descriptionAndDebugMemoryUsage(void) const;
+        void descriptionAndDebugMemoryUsage() const;
 
         //! Extra information on the success/failure of restoring the model state.
         //! In certain situations such as no data being loaded from the restorer
@@ -320,7 +320,7 @@ class API_EXPORT CAnomalyJob : public CDataProcessor
 
         //! Get the bucketLength, or half the bucketLength if
         //! out-of-phase buckets are active
-        core_t::TTime effectiveBucketLength(void) const;
+        core_t::TTime effectiveBucketLength() const;
 
         //! Update configuration
         void updateConfig(const std::string &config);
@@ -372,7 +372,7 @@ class API_EXPORT CAnomalyJob : public CDataProcessor
 
         //! Iterate over the models, refresh their memory status, and send a report
         //! to the API
-        void refreshMemoryAndReport(void);
+        void refreshMemoryAndReport();
 
         //! Update configuration
         void doForecast(const std::string &controlMessage);
@@ -418,7 +418,7 @@ class API_EXPORT CAnomalyJob : public CDataProcessor
                                                   model::CResourceMonitor &resourceMonitor);
 
         //! Prune all the models
-        void pruneAllModels(void);
+        void pruneAllModels();
 
     private:
         //! The job ID

include/api/CBackgroundPersister.h

@@ -90,14 +90,14 @@ class API_EXPORT CBackgroundPersister : private core::CNonCopyable
                              const TFirstProcessorPeriodicPersistFunc &firstProcessorPeriodicPersistFunc,
                              core::CDataAdder &dataAdder);
 
-        ~CBackgroundPersister(void);
+        ~CBackgroundPersister();
 
         //! Is background persistence currently in progress?
-        bool isBusy(void) const;
+        bool isBusy() const;
 
         //! Wait for any background persistence currently in progress to
         //! complete
-        bool waitForIdle(void);
+        bool waitForIdle();
 
         //! Add a function to be called when the background persist is started.
         //! This will be rejected if a background persistence is currently in
@@ -117,13 +117,13 @@ class API_EXPORT CBackgroundPersister : private core::CNonCopyable
         //! Start a background persist is one is not running.
         //! Calls the first processor periodic persist function first.
         //! Concurrent calls to this method are not threadsafe.
-        bool startBackgroundPersist(void);
+        bool startBackgroundPersist();
 
         //! If the periodic persist interval has passed since the last persist
         //! then it is appropriate to persist now.  Start it by calling the
         //! first processor periodic persist function.
         //! Concurrent calls to this method are not threadsafe.
-        bool startBackgroundPersistIfAppropriate(void);
+        bool startBackgroundPersistIfAppropriate();
 
     private:
         //! Implementation of the background thread
@@ -134,8 +134,8 @@ class API_EXPORT CBackgroundPersister : private core::CNonCopyable
 
             protected:
                 //! Inherited virtual interface
-                virtual void run(void);
-                virtual void shutdown(void);
+                virtual void run();
+                virtual void shutdown();
 
             private:
                 //! Reference to the owning background persister
@@ -149,13 +149,13 @@ class API_EXPORT CBackgroundPersister : private core::CNonCopyable
 
         //! When this function is called a background persistence will be
         //! triggered unless there is already one in progress.
-        bool startPersist(void);
+        bool startPersist();
 
         //! Clear any persistence functions that have been added but not yet
         //! invoked.  This will be rejected if a background persistence is
         //! currently in progress.
         //! \return true if the list of functions is clear; false if not.
-        bool clear(void);
+        bool clear();
 
     private:
         //! How frequently should background persistence be attempted?

include/api/CBaseTokenListDataTyper.h

@@ -114,7 +114,7 @@ class API_EXPORT CBaseTokenListDataTyper : public CDataTyper
                                 const std::string &fieldName);
 
         //! Dump stats
-        virtual void dumpStats(void) const;
+        virtual void dumpStats() const;
 
         //! Compute a type from a string.  The raw string length may be longer
         //! than the length of the passed string, because the passed string may
@@ -139,7 +139,7 @@ class API_EXPORT CBaseTokenListDataTyper : public CDataTyper
                                          bool &wasCached);
 
         //! Has the data typer's state changed?
-        virtual bool hasChanged(void) const;
+        virtual bool hasChanged() const;
 
         //! Populate the object from part of a state document
         virtual bool acceptRestoreTraverser(core::CStateRestoreTraverser &traverser);
@@ -148,7 +148,7 @@ class API_EXPORT CBaseTokenListDataTyper : public CDataTyper
         virtual void acceptPersistInserter(core::CStatePersistInserter &inserter) const;
 
         //! Make a function that can be called later to persist state
-        virtual TPersistFunc makePersistFunc(void) const;
+        virtual TPersistFunc makePersistFunc() const;
 
     protected:
         //! Split the string into a list of tokens.  The result of the
@@ -211,13 +211,13 @@ class API_EXPORT CBaseTokenListDataTyper : public CDataTyper
                                size_t index);
 
                 //! Accessors
-                const std::string &str(void) const;
-                size_t            index(void) const;
-                size_t            typeCount(void) const;
+                const std::string &str() const;
+                size_t            index() const;
+                size_t            typeCount() const;
                 void              typeCount(size_t typeCount);
 
                 //! Increment the type count
-                void              incTypeCount(void);
+                void              incTypeCount();
 
             private:
                 //! String value of the token

include/api/CBenchMarker.h

@@ -65,7 +65,7 @@ class API_EXPORT CBenchMarker
         using TRegexIntSizeStrPrMapPrVecCItr = TRegexIntSizeStrPrMapPrVec::const_iterator;
 
     public:
-        CBenchMarker(void);
+        CBenchMarker();
 
         //! Initialise from a file
         bool init(const std::string &regexFilename);
@@ -74,7 +74,7 @@ class API_EXPORT CBenchMarker
         void addResult(const std::string &message,
                        int type);
 
-        void dumpResults(void) const;
+        void dumpResults() const;
 
     private:
         //! Number of messages passed to the benchmarker

include/api/CCategoryExamplesCollector.h

@@ -70,7 +70,7 @@ class API_EXPORT CCategoryExamplesCollector
         bool acceptRestoreTraverser(core::CStateRestoreTraverser &traverser);
 
         //! Clear all examples
-        void clear(void);
+        void clear();
 
     private:
         using TSizeStrSetUMap = boost::unordered_map<std::size_t, TStrSet>;

include/api/CCmdSkeleton.h

@@ -54,11 +54,11 @@ class API_EXPORT CCmdSkeleton : private core::CNonCopyable
                      CDataProcessor &processor);
 
         //! Pass input to the processor until it's consumed as much as it can.
-        bool ioLoop(void);
+        bool ioLoop();
 
     private:
         //! Persists the state of the models
-        bool persistState(void);
+        bool persistState();
 
     private:
         //! NULL if state restoration is not required.

include/api/CCsvInputParser.h

@@ -153,7 +153,7 @@ class API_EXPORT CCsvInputParser : public CInputParser
                         char separator = COMMA);
 
         //! Get field name row exactly as it was in the input
-        const std::string &fieldNameStr(void) const;
+        const std::string &fieldNameStr() const;
 
         //! Read records from the stream. The supplied reader function is called
         //! once per record.  If the supplied reader function returns false,
@@ -165,10 +165,10 @@ class API_EXPORT CCsvInputParser : public CInputParser
     private:
         //! Attempt to parse a single CSV record from the stream into the
         //! working record.  The CSV is assumed to be in the Excel style.
-        bool parseCsvRecordFromStream(void);
+        bool parseCsvRecordFromStream();
 
         //! Attempt to parse the field names from the working record.
-        bool parseFieldNames(void);
+        bool parseFieldNames();
 
         //! Attempt to parse the current working record into data fields.
         bool parseDataRecord(const TStrRefVec &fieldValRefs);

include/api/CCsvOutputWriter.h

@@ -81,15 +81,15 @@ class API_EXPORT CCsvOutputWriter : public COutputHandler
                          char separator = COMMA);
 
         //! Destructor flushes the stream
-        virtual ~CCsvOutputWriter(void);
+        virtual ~CCsvOutputWriter();
 
         //! Set field names, adding extra field names if they're not already
         //! present - this is only allowed once
         virtual bool fieldNames(const TStrVec &fieldNames,
                                 const TStrVec &extraFieldNames);
 
         //! Get field names
-        virtual const TStrVec &fieldNames(void) const;
+        virtual const TStrVec &fieldNames() const;
 
         // Bring the other overload of fieldNames() into scope
         using COutputHandler::fieldNames;
@@ -106,11 +106,11 @@ class API_EXPORT CCsvOutputWriter : public COutputHandler
 
         //! Get the contents of the internal string stream - for use with the
         //! zero argument constructor
-        std::string internalString(void) const;
+        std::string internalString() const;
 
     protected:
         //! Output stream accessor
-        std::ostream &outputStream(void);
+        std::ostream &outputStream();
 
     private:
         //! Append a field to the work record, quoting it if required, and