From b449826a61eaa0a754e55ca8143882216a07d7e0 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 25 Mar 2008 13:34:44 +0000 Subject: =?UTF-8?q?Fix=20compile=20errors/warnings=20with=20gcc=204.3=20?= =?UTF-8?q?=20-=20added=20missing=20#includes=20that=20were=20implicitly?= =?UTF-8?q?=20included=20via=20old=20headers.=20=20-=20add=20namespace-qua?= =?UTF-8?q?lifiers=20to=20fix=20"changes=20meaning=20of=20name"=20warnings?= =?UTF-8?q?.=20=20-=20./qpid/ptr=5Fmap.h:51:=20fixed=20"qualified=20return?= =?UTF-8?q?=20value"=20warning.=20=20-=20use=20const=20char*=20for=20"conv?= =?UTF-8?q?ersion=20from=20string=20constant=20to=20=E2=80=98char*?= =?UTF-8?q?=E2=80=99"=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied patch from https://issues.apache.org/jira/browse/QPID-869 remove depenency on boost/date_time, causes warnings with gcc 4.3. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640806 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/Options.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/Options.cpp') diff --git a/cpp/src/qpid/Options.cpp b/cpp/src/qpid/Options.cpp index 212171b8c5..a5d3b54dd6 100644 --- a/cpp/src/qpid/Options.cpp +++ b/cpp/src/qpid/Options.cpp @@ -93,7 +93,7 @@ void Options::parse(int argc, char** argv, const std::string& configFile, bool a if (allowUnknown) { // This hideous workaround is required because boost 1.33 has a bug // that causes 'allow_unregistered' to not work. - po::command_line_parser clp = po::command_line_parser(argc, argv). + po::command_line_parser clp = po::command_line_parser(argc, const_cast(argv)). options(*this).allow_unregistered(); po::parsed_options opts = clp.run(); po::parsed_options filtopts = clp.run(); @@ -105,7 +105,7 @@ void Options::parse(int argc, char** argv, const std::string& configFile, bool a po::store(filtopts, vm); } else - po::store(po::parse_command_line(argc, argv, *this), vm); + po::store(po::parse_command_line(argc, const_cast(argv), *this), vm); } parsing="environment variables"; po::store(po::parse_environment(*this, EnvOptMapper(*this)), vm); -- cgit v1.2.1