Fix a very nasty conversion bug in Option c'tor

Sometimes C++ can be really bad!

In this case an hard coded c string selects Option c'tor
with int argument instead of the std::string one becuase
it is considered a better matching by the compiler.

Fix the bug changing the argument type from std::string to
const char* so to be a better match then the int one.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index c31a49e78ae9b62e4cbfb7872baf0edf8db31c1a..2eb7d1c62c6a0c9480a4ebf75c2e0adef1f6c277 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -64,7 +64,7 @@ namespace {
     size_t idx;
 
     Option();
     size_t idx;
 
     Option();

-    Option(const std::string& defaultValue, OptionType = STRING);
+    Option(const char* defaultValue, OptionType = STRING);

     Option(bool defaultValue, OptionType = CHECK);
     Option(int defaultValue, int minValue, int maxValue);
 
     Option(bool defaultValue, OptionType = CHECK);
     Option(int defaultValue, int minValue, int maxValue);
 


@@ -342,7 +342,7 @@ namespace {
 
   Option::Option() {} // To allow insertion in a std::map
 
 
   Option::Option() {} // To allow insertion in a std::map
 

-  Option::Option(const std::string& def, OptionType t)
+  Option::Option(const char* def, OptionType t)

   : defaultValue(def), currentValue(def), type(t), idx(options.size()), minValue(0), maxValue(0) {}
 
   Option::Option(bool def, OptionType t)
   : defaultValue(def), currentValue(def), type(t), idx(options.size()), minValue(0), maxValue(0) {}
 
   Option::Option(bool def, OptionType t)