Merge branch 2.4

2012-12-24 17:10:07 +04:00
parent 2128bd25e4 014a500f79
commit 13b6a3a15e
20 changed files with 67 additions and 40 deletions
--- a/modules/core/src/command_line_parser.cpp
+++ b/modules/core/src/command_line_parser.cpp
@@ -295,7 +295,7 @@ void CommandLineParser::Impl::sort_params()
        sort(data[i].keys.begin(), data[i].keys.end());
    }

-    sort (data.begin(), data.end(), cmp_params);
+    std::sort (data.begin(), data.end(), cmp_params);
 }

 string CommandLineParser::Impl::cat_string(const string& str) const