misc cleanup from Baldersheim

* include file cleanup
* only do LOG_SETUP as needed
* remove "virtual" where "override" is specified also
* some minor reformatting and indentation changes

1 files changed, 2 insertions, 2 deletions

diff --git a/juniper/src/test/mcandTest.h b/juniper/src/test/mcandTest.h
index 754c18ee9dd..3fc32ee9f5d 100644
--- a/juniper/src/test/mcandTest.h
+++ b/juniper/src/test/mcandTest.h
@@ -196,7 +196,7 @@ protected:
      * print_progress which includes backspace does not work.
      * We'll use a single '.' instead.
      */
-    virtual void print_progress() override { *m_osptr << '.' << std::flush; }
+    void print_progress() override { *m_osptr << '.' << std::flush; }
 
 public:
 
@@ -207,7 +207,7 @@ public:
      *                         main entry points
      *************************************************************************/
     void Run(MethodContainer::iterator &itr);
-    virtual void Run() override;
+    void Run() override;
     void Run(const char *method);
     void Run(int argc, char* argv[]);
 };