Fix compile errors/warnings with gcc 4.3

 - added missing #includes that were implicitly included via old headers.
 - add namespace-qualifiers to fix "changes meaning of name" warnings.
 - ./qpid/ptr_map.h:51: fixed "qualified return value" warning.
 - use const char* for "conversion from string constant to ‘char*’" warnings

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

1 files changed, 2 insertions, 2 deletions

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<char**>(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<char**>(argv), *this), vm);
         }
         parsing="environment variables";
         po::store(po::parse_environment(*this, EnvOptMapper(*this)), vm);