Apply @thk123's fixes

Author: reuk

src/cbmc/cbmc_parse_options.cpp

@@ -601,7 +601,7 @@ int cbmc_parse_optionst::get_goto_program(
         return 6;
       }
 
-      auto language=get_language_from_filename(filename);
+      std::unique_ptr<languaget> language=get_language_from_filename(filename);
 
       if(!language)
       {
@@ -750,7 +750,7 @@ void cbmc_parse_optionst::preprocessing()
       return;
     }
 
-    auto ptr=get_language_from_filename(filename);
+    std::unique_ptr<languaget> ptr=get_language_from_filename(filename);
 
     if(!ptr)
     {

src/cbmc/cbmc_solvers.cpp

@@ -132,16 +132,15 @@ std::unique_ptr<cbmc_solverst::solvert> cbmc_solverst::get_dimacs()
 
 std::unique_ptr<cbmc_solverst::solvert> cbmc_solverst::get_bv_refinement()
 {
-  auto prop=[this]() -> std::unique_ptr<propt>
+  std::unique_ptr<propt> prop=[this]() -> std::unique_ptr<propt>
   {
     // We offer the option to disable the SAT preprocessor
     if(options.get_bool_option("sat-preprocessor"))
     {
       no_beautification();
       return util_make_unique<satcheckt>();
     }
-    else
-      return util_make_unique<satcheck_no_simplifiert>();
+    return util_make_unique<satcheck_no_simplifiert>();
   }();
 
   prop->set_message_handler(get_message_handler());

src/clobber/clobber_parse_options.cpp

@@ -247,9 +247,9 @@ bool clobber_parse_optionst::get_goto_program(
         return true;
       }
 
-      auto language=get_language_from_filename(filename);
+      std::unique_ptr<languaget> language=get_language_from_filename(filename);
 
-      if(language==nullptr)
+      if(!language)
       {
         error() << "failed to figure out type of file `" <<  filename << "'"
                 << eom;

src/langapi/language_util.cpp

@@ -28,9 +28,9 @@ static std::unique_ptr<languaget> get_language(
      symbol->mode=="")
     return get_default_language();
 
-  auto ptr=get_language_from_mode(symbol->mode);
+  std::unique_ptr<languaget> ptr=get_language_from_mode(symbol->mode);
 
-  if(ptr==nullptr)
+  if(!ptr)
     throw "symbol `"+id2string(symbol->name)+
       "' has unknown mode '"+id2string(symbol->mode)+"'";