config: Tidy and set defaults.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

include/pfasst.hpp

@@ -9,7 +9,7 @@
 
 namespace pfasst
 {
-  inline static void init(int argc, char** argv, std::function<void()> opts, std::function<void()> logs)
+  inline static void init(int argc, char** argv, std::function<void()> opts=nullptr, std::function<void()> logs=nullptr)
   {
     if (opts) {
       opts();

include/pfasst/config.hpp

@@ -15,32 +15,27 @@ using namespace std;
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
 
-#include "logging.hpp"
-
 namespace pfasst
 {
 
   namespace config
   {
     /**
-     * @note This is using the Singleton Pattern.
-     *    pfasst::options::get_instance() is thread-safe with C++11.
+     * @note This uses the Singleton Pattern, and hence pfasst::options::get_instance() is
+     *    thread-safe with C++11.
      */
     class options
     {
       public:
-        //! Maximum width of a line in the help output
         static const size_t LINE_WIDTH = 100;
 
       private:
         po::options_description all_options;
         map<string, po::options_description> option_groups;
-
         po::variables_map variables_map;
         vector<string> unrecognized_args;
         bool initialized = false;
 
-      private:
         options() {}
         options(const options&) = delete;
         void operator=(const options&) = delete;