Merge pull request #136 from torbjoernk/feature/tackle-compiler-warnings

memmett · memmett · commit 0270dce12baf · 2014-12-09T11:08:26.000-08:00
tackling compiler warnings

Yay -- very nice.
diff --git a/include/pfasst.hpp b/include/pfasst.hpp
@@ -9,7 +9,7 @@
 
 namespace pfasst
 {
-  static void init(int argc, char** argv)
+  inline static void init(int argc, char** argv)
   {
     SDC<>::enable_config_options(0);
     Quadrature::enable_config_options(0);
diff --git a/include/pfasst/config.hpp b/include/pfasst/config.hpp
@@ -102,27 +102,27 @@ namespace pfasst
 
 
     template<typename T>
-    static const T get_value(const string& name, const T& default_val)
+    inline static T get_value(const string& name, const T& default_val)
     {
       return Options::get_instance().get_variables_map().count(name) 
               ? Options::get_instance().get_variables_map()[name].as<T>() : default_val;
     }
 
 
     template<typename T>
-    static const T get_value(const string& name)
+    inline static T get_value(const string& name)
     {
       return Options::get_instance().get_variables_map()[name].as<T>();
     }
 
 
-    static bool no_params_given()
+    inline static bool no_params_given()
     {
       return Options::get_instance().get_variables_map().empty();
     }
 
 
-    static string pretty_print()
+    inline static string pretty_print()
     {
       stringstream s;
       s << "Logging Options:" << endl
@@ -140,7 +140,7 @@ namespace pfasst
     /**
      * @returns empty string if params are set and `if_no_params` is `true`
      */
-    static string print_help(bool if_no_params = false)
+    inline static string print_help(bool if_no_params = false)
     {
       if (!if_no_params || (if_no_params && no_params_given())) {
         return pretty_print();
@@ -150,14 +150,14 @@ namespace pfasst
     }
 
 
-    static void init_global_options(po::options_description& opts)
+    inline static void init_global_options(po::options_description& opts)
     {
       opts.add_options()
         ("help,h", "display this help message");
     }
 
 
-    static void init_config()
+    inline static void init_config()
     {
       Options::get_instance()
         .register_init_function("Global Options",
@@ -168,7 +168,7 @@ namespace pfasst
     }
 
 
-    static void read_commandline(int argc, char* argv[], bool exit_on_help = true)
+    inline static void read_commandline(int argc, char* argv[], bool exit_on_help = true)
     {
       po::parsed_options parsed = po::command_line_parser(argc, argv)
                                     .options(Options::get_instance().get_all_options())
@@ -188,7 +188,7 @@ namespace pfasst
     /**
      * @throws invalid_argument if the given file could not be opened
      */
-    static void read_config_file(string file_name)
+    inline static void read_config_file(string file_name)
     {
       ifstream ifs(file_name.c_str(), ios_base::in);
       if (!ifs) {
diff --git a/include/pfasst/encap/encap_sweeper.hpp b/include/pfasst/encap/encap_sweeper.hpp
@@ -193,6 +193,7 @@ namespace pfasst
          */
         virtual void reevaluate(bool initial_only=false)
         {
+          UNUSED(initial_only);
           throw NotImplementedYet("sweeper");
         }
 
@@ -228,6 +229,7 @@ namespace pfasst
          */
         virtual void residual(time dt, vector<shared_ptr<Encapsulation<time>>> dst) const
         {
+          UNUSED(dt); UNUSED(dst);
           throw NotImplementedYet("residual");
         }
 
@@ -241,6 +243,7 @@ namespace pfasst
           if (this->abs_residual_tol > 0.0 || this->rel_residual_tol > 0.0) {
             if (this->residuals.size() == 0) {
               for (auto x: this->get_nodes()) {
+                UNUSED(x);
                 this->residuals.push_back(this->get_factory()->create(pfasst::encap::solution));
               }
             }
diff --git a/include/pfasst/encap/imex_sweeper.hpp b/include/pfasst/encap/imex_sweeper.hpp
@@ -309,6 +309,7 @@ namespace pfasst
 
         void predict_without_left(bool initial)
         {
+          UNUSED(initial);
           time dt = this->get_controller()->get_time_step();
           time t  = this->get_controller()->get_time();
           time ds;
diff --git a/include/pfasst/logging.hpp b/include/pfasst/logging.hpp
@@ -86,7 +86,7 @@ namespace pfasst
     /**
      * sets default configuration for default loggers
      */
-    static void load_default_config()
+    inline static void load_default_config()
     {
       const string TIMESTAMP = OUT::white + "%datetime{%H:%m:%s,%g}" + OUT::reset + " ";
       const string LEVEL = "[%level]";
@@ -137,7 +137,7 @@ namespace pfasst
      *
      * \see https://github.com/easylogging/easyloggingpp#logging-flags
      */
-    static void set_logging_flags()
+    inline static void set_logging_flags()
     {
       el::Loggers::addFlag(el::LoggingFlag::NewLineForContainer);
       el::Loggers::addFlag(el::LoggingFlag::LogDetailedCrashReason);
@@ -149,9 +149,9 @@ namespace pfasst
     }
 
 #ifdef NDEBUG
-    static void test_logging_levels() {}
+    inline static void test_logging_levels() {}
 #else
-    static void test_logging_levels()
+    inline static void test_logging_levels()
     {
       cout << "### Example of different Logging Levels:" << endl;
       LOG(INFO) << "info";
@@ -176,7 +176,7 @@ namespace pfasst
      * \param[in] argc number of command line arguments
      * \param[in] argv command line arguments
      */
-    static void start_log(int argc, char** argv)
+    inline static void start_log(int argc, char** argv)
     {
       _START_EASYLOGGINGPP(argc, argv);
       set_logging_flags();
diff --git a/include/pfasst/quadrature.hpp b/include/pfasst/quadrature.hpp
@@ -29,8 +29,7 @@ namespace pfasst
   namespace quadrature
   {
     template<typename precision = pfasst::time_precision>
-    shared_ptr<IQuadrature<precision>> quadrature_factory(const size_t nnodes,
-                                               const QuadratureType qtype)
+    shared_ptr<IQuadrature<precision>> quadrature_factory(const size_t nnodes, const QuadratureType qtype)
     {
       if (qtype == QuadratureType::GaussLegendre) {
         return make_shared<GaussLegendre<precision>>(nnodes);
@@ -112,7 +111,7 @@ namespace pfasst
     // note: GCC fails with "error: explicit template specialization cannot have a storage class"
     //       if this template specialization is also declared 'static'; Clang does not care.
     template<>
-    const pfasst::quadrature::QuadratureType get_value(const string& name)
+    inline pfasst::quadrature::QuadratureType get_value(const string& name)
     {
       const string type = Options::get_instance().get_variables_map()[name].as<string>();
       if (type == "gauss-lobatto") {
@@ -133,8 +132,8 @@ namespace pfasst
     // note: GCC fails with "error: explicit template specialization cannot have a storage class"
     //       if this template specialization is also declared 'static'; Clang does not care.
     template<>
-    const pfasst::quadrature::QuadratureType get_value(const string& name,
-                                                       const pfasst::quadrature::QuadratureType& default_value)
+    inline pfasst::quadrature::QuadratureType get_value(const string& name,
+                                                        const pfasst::quadrature::QuadratureType& default_value)
     {
       if (Options::get_instance().get_variables_map().count(name) == 1) {
         return pfasst::config::get_value<pfasst::quadrature::QuadratureType>(name);
diff --git a/tests/examples/advection_diffusion/test_advection_diffusion.cpp b/tests/examples/advection_diffusion/test_advection_diffusion.cpp
@@ -49,7 +49,7 @@ TEST(ErrorTest, VanillaSDC)
     }
 
     EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));
-    ASSERT_EQ(max_iter, 3);
+    ASSERT_EQ(max_iter, (size_t)3);
   }
 
   {
@@ -66,7 +66,7 @@ TEST(ErrorTest, VanillaSDC)
     }
 
     EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));
-    ASSERT_EQ(max_iter, 2);
+    ASSERT_EQ(max_iter, (size_t)2);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace pfasst`
`11`	`11`	`{`
`12`		`- static void init(int argc, char** argv)`
	`12`	`+ inline static void init(int argc, char** argv)`
`13`	`13`	`{`
`14`	`14`	`SDC<>::enable_config_options(0);`
`15`	`15`	`Quadrature::enable_config_options(0);`
Original file line number	Diff line number	Diff line change
`@@ -102,27 +102,27 @@ namespace pfasst`
`102`	`102`
`103`	`103`
`104`	`104`	`template<typename T>`
`105`		`- static const T get_value(const string& name, const T& default_val)`
	`105`	`+ inline static T get_value(const string& name, const T& default_val)`
`106`	`106`	`{`
`107`	`107`	`return Options::get_instance().get_variables_map().count(name)`
`108`	`108`	`? Options::get_instance().get_variables_map()[name].as<T>() : default_val;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`
`112`	`112`	`template<typename T>`
`113`		`- static const T get_value(const string& name)`
	`113`	`+ inline static T get_value(const string& name)`
`114`	`114`	`{`
`115`	`115`	`return Options::get_instance().get_variables_map()[name].as<T>();`
`116`	`116`	`}`
`117`	`117`
`118`	`118`
`119`		`- static bool no_params_given()`
	`119`	`+ inline static bool no_params_given()`
`120`	`120`	`{`
`121`	`121`	`return Options::get_instance().get_variables_map().empty();`
`122`	`122`	`}`
`123`	`123`
`124`	`124`
`125`		`- static string pretty_print()`
	`125`	`+ inline static string pretty_print()`
`126`	`126`	`{`
`127`	`127`	`stringstream s;`
`128`	`128`	`s << "Logging Options:" << endl`
`@@ -140,7 +140,7 @@ namespace pfasst`
`140`	`140`	`/**`
`141`	`141`	* @returns empty string if params are set and `if_no_params` is `true`
`142`	`142`	`*/`
`143`		`- static string print_help(bool if_no_params = false)`
	`143`	`+ inline static string print_help(bool if_no_params = false)`
`144`	`144`	`{`
`145`	`145`	`if (!if_no_params \|\| (if_no_params && no_params_given())) {`
`146`	`146`	`return pretty_print();`
`@@ -150,14 +150,14 @@ namespace pfasst`
`150`	`150`	`}`
`151`	`151`
`152`	`152`
`153`		`- static void init_global_options(po::options_description& opts)`
	`153`	`+ inline static void init_global_options(po::options_description& opts)`
`154`	`154`	`{`
`155`	`155`	`opts.add_options()`
`156`	`156`	`("help,h", "display this help message");`
`157`	`157`	`}`
`158`	`158`
`159`	`159`
`160`		`- static void init_config()`
	`160`	`+ inline static void init_config()`
`161`	`161`	`{`
`162`	`162`	`Options::get_instance()`
`163`	`163`	`.register_init_function("Global Options",`
`@@ -168,7 +168,7 @@ namespace pfasst`
`168`	`168`	`}`
`169`	`169`
`170`	`170`
`171`		`- static void read_commandline(int argc, char* argv[], bool exit_on_help = true)`
	`171`	`+ inline static void read_commandline(int argc, char* argv[], bool exit_on_help = true)`
`172`	`172`	`{`
`173`	`173`	`po::parsed_options parsed = po::command_line_parser(argc, argv)`
`174`	`174`	`.options(Options::get_instance().get_all_options())`
`@@ -188,7 +188,7 @@ namespace pfasst`
`188`	`188`	`/**`
`189`	`189`	`* @throws invalid_argument if the given file could not be opened`
`190`	`190`	`*/`
`191`		`- static void read_config_file(string file_name)`
	`191`	`+ inline static void read_config_file(string file_name)`
`192`	`192`	`{`
`193`	`193`	`ifstream ifs(file_name.c_str(), ios_base::in);`
`194`	`194`	`if (!ifs) {`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ namespace pfasst`
`193`	`193`	`*/`
`194`	`194`	`virtual void reevaluate(bool initial_only=false)`
`195`	`195`	`{`
	`196`	`+ UNUSED(initial_only);`
`196`	`197`	`throw NotImplementedYet("sweeper");`
`197`	`198`	`}`
`198`	`199`
`@@ -228,6 +229,7 @@ namespace pfasst`
`228`	`229`	`*/`
`229`	`230`	`virtual void residual(time dt, vector<shared_ptr<Encapsulation<time>>> dst) const`
`230`	`231`	`{`
	`232`	`+ UNUSED(dt); UNUSED(dst);`
`231`	`233`	`throw NotImplementedYet("residual");`
`232`	`234`	`}`
`233`	`235`
`@@ -241,6 +243,7 @@ namespace pfasst`
`241`	`243`	`if (this->abs_residual_tol > 0.0 \|\| this->rel_residual_tol > 0.0) {`
`242`	`244`	`if (this->residuals.size() == 0) {`
`243`	`245`	`for (auto x: this->get_nodes()) {`
	`246`	`+ UNUSED(x);`
`244`	`247`	`this->residuals.push_back(this->get_factory()->create(pfasst::encap::solution));`
`245`	`248`	`}`
`246`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ namespace pfasst`
`309`	`309`
`310`	`310`	`void predict_without_left(bool initial)`
`311`	`311`	`{`
	`312`	`+ UNUSED(initial);`
`312`	`313`	`time dt = this->get_controller()->get_time_step();`
`313`	`314`	`time t = this->get_controller()->get_time();`
`314`	`315`	`time ds;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ TEST(ErrorTest, VanillaSDC)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));`
`52`		`- ASSERT_EQ(max_iter, 3);`
	`52`	`+ ASSERT_EQ(max_iter, (size_t)3);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`{`
`@@ -66,7 +66,7 @@ TEST(ErrorTest, VanillaSDC)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`EXPECT_THAT(err, testing::Pointwise(DoubleLess(), tol));`
`69`		`- ASSERT_EQ(max_iter, 2);`
	`69`	`+ ASSERT_EQ(max_iter, (size_t)2);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`