From 46ce5976aec207a519a760956883b376bb11c7f2 Mon Sep 17 00:00:00 2001 From: Leonid Beynenson Date: Thu, 20 Sep 2012 18:11:33 +0400 Subject: [PATCH] Fix: Windows compilation error in CommandLineParser. --- modules/core/src/command_line_parser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/src/command_line_parser.cpp b/modules/core/src/command_line_parser.cpp index 8f998ab..840bf81 100644 --- a/modules/core/src/command_line_parser.cpp +++ b/modules/core/src/command_line_parser.cpp @@ -72,14 +72,14 @@ static void from_str(const string& str, int type, void* dst) else if( type == Param::STRING ) ss >> *(string*)dst; 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()) { string err_msg = "can not convert: [" + str + + "] 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 CommandLineParser::Impl::split_range_string(const string& _str, c + string(", ") + string(1, ss) + string(")"), - __func__, __FILE__, __LINE__ + "", __FILE__, __LINE__ ); } begin = true; @@ -445,7 +445,7 @@ vector CommandLineParser::Impl::split_range_string(const string& _str, c + string(", ") + string(1, ss) + string(")"), - __func__, __FILE__, __LINE__ + "", __FILE__, __LINE__ ); } begin = false; @@ -469,7 +469,7 @@ vector CommandLineParser::Impl::split_range_string(const string& _str, c + string(", ") + string(1, ss) + string(")"), - __func__, __FILE__, __LINE__ + "", __FILE__, __LINE__ ); } -- 2.7.4