Commit 46ce5976 authored by Leonid Beynenson's avatar Leonid Beynenson

Fix: Windows compilation error in CommandLineParser.

parent 0bde00a8
...@@ -72,14 +72,14 @@ static void from_str(const string& str, int type, void* dst) ...@@ -72,14 +72,14 @@ static void from_str(const string& str, int type, void* dst)
else if( type == Param::STRING ) else if( type == Param::STRING )
ss >> *(string*)dst; ss >> *(string*)dst;
else else
throw cv::Exception(CV_StsBadArg, "unknown/unsupported parameter type", __func__, __FILE__, __LINE__); throw cv::Exception(CV_StsBadArg, "unknown/unsupported parameter type", "", __FILE__, __LINE__);
if (ss.fail()) if (ss.fail())
{ {
string err_msg = "can not convert: [" + str + string err_msg = "can not convert: [" + str +
+ "] to [" + get_type_name(type) + "]"; + "] to [" + get_type_name(type) + "]";
throw cv::Exception(CV_StsBadArg, err_msg, __func__, __FILE__, __LINE__); throw cv::Exception(CV_StsBadArg, err_msg, "", __FILE__, __LINE__);
} }
} }
...@@ -425,7 +425,7 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c ...@@ -425,7 +425,7 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c
+ string(", ") + string(", ")
+ string(1, ss) + string(1, ss)
+ string(")"), + string(")"),
__func__, __FILE__, __LINE__ "", __FILE__, __LINE__
); );
} }
begin = true; begin = true;
...@@ -445,7 +445,7 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c ...@@ -445,7 +445,7 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c
+ string(", ") + string(", ")
+ string(1, ss) + string(1, ss)
+ string(")"), + string(")"),
__func__, __FILE__, __LINE__ "", __FILE__, __LINE__
); );
} }
begin = false; begin = false;
...@@ -469,7 +469,7 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c ...@@ -469,7 +469,7 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c
+ string(", ") + string(", ")
+ string(1, ss) + string(1, ss)
+ string(")"), + string(")"),
__func__, __FILE__, __LINE__ "", __FILE__, __LINE__
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment