[mlpack-svn] r15505 - mlpack/trunk/src/mlpack/core/util

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Thu Jul 18 15:47:53 2013
New Revision: 15505

Log:
Remove c_str() where possible.


Modified:
   mlpack/trunk/src/mlpack/core/util/cli.cpp
   mlpack/trunk/src/mlpack/core/util/cli_impl.hpp

Modified: mlpack/trunk/src/mlpack/core/util/cli.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/util/cli.cpp	(original)
+++ mlpack/trunk/src/mlpack/core/util/cli.cpp	Thu Jul 18 15:47:53 2013
@@ -40,7 +40,7 @@
  * @param optionsName Name of the module, as far as boost is concerned.
  */
 CLI::CLI(const std::string& optionsName) :
-    desc(optionsName.c_str()), didParse(false), doc(&emptyProgramDoc)
+    desc(optionsName), didParse(false), doc(&emptyProgramDoc)
 {
   return;
 }
@@ -71,7 +71,7 @@
     {
       std::string i = (*it).first;
       Log::Info << "  " << i << ": ";
-      timer.PrintTimer((*it).first.c_str());
+      timer.PrintTimer((*it).first);
     }
   }
 
@@ -485,29 +485,29 @@
     ParamData data = iter->second;
     if (data.tname == TYPENAME(std::string))
     {
-      std::string value = GetParam<std::string>(key.c_str());
+      std::string value = GetParam<std::string>(key);
       if (value == "")
         Log::Info << "\"\"";
       Log::Info << value;
     }
     else if (data.tname == TYPENAME(int))
     {
-      int value = GetParam<int>(key.c_str());
+      int value = GetParam<int>(key);
       Log::Info << value;
     }
     else if (data.tname == TYPENAME(bool))
     {
-      bool value = HasParam(key.c_str());
+      bool value = HasParam(key);
       Log::Info << (value ? "true" : "false");
     }
     else if (data.tname == TYPENAME(float))
     {
-      float value = GetParam<float>(key.c_str());
+      float value = GetParam<float>(key);
       Log::Info << value;
     }
     else if (data.tname == TYPENAME(double))
     {
-      double value = GetParam<double>(key.c_str());
+      double value = GetParam<double>(key);
       Log::Info << value;
     }
     else
@@ -698,7 +698,7 @@
     std::string str = *iter;
     if (!vmap.count(str))
     { // If a required option isn't there...
-      Log::Fatal << "Required option --" << str.c_str() << " is undefined."
+      Log::Fatal << "Required option --" << str << " is undefined."
           << std::endl;
     }
   }

Modified: mlpack/trunk/src/mlpack/core/util/cli_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/util/cli_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/util/cli_impl.hpp	Thu Jul 18 15:47:53 2013
@@ -42,8 +42,7 @@
   AddAlias(alias, path);
 
   // Add the option to boost program_options.
-  desc.add_options()
-    (progOptId.c_str(), po::value<T>(),  description.c_str());
+  desc.add_options()(progOptId.c_str(), po::value<T>(), description.c_str());
 
   // Make sure the appropriate metadata is inserted into gmap.
   gmap_t& gmap = GetSingleton().globalValues;