diff options
Diffstat (limited to 'qpid/cpp/include/qpid/Options.h')
| -rw-r--r-- | qpid/cpp/include/qpid/Options.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/qpid/cpp/include/qpid/Options.h b/qpid/cpp/include/qpid/Options.h index 63d91c2d72..0bbe7b704f 100644 --- a/qpid/cpp/include/qpid/Options.h +++ b/qpid/cpp/include/qpid/Options.h @@ -81,13 +81,12 @@ po::value_semantic* optValue(T& value, const char* name) { */ template <class T> po::value_semantic* optValue(std::vector<T>& value, const char* name) { - using namespace std; - ostringstream os; - copy(value.begin(), value.end(), ostream_iterator<T>(os, " ")); - string val=os.str(); + std::ostringstream os; + std::copy(value.begin(), value.end(), std::ostream_iterator<T>(os, " ")); + std::string val=os.str(); if (!val.empty()) val.erase(val.end()-1); // Remove trailing " " - return (new OptionValue<vector<T> >(value, prettyArg(name, val))); + return (new OptionValue<std::vector<T> >(value, prettyArg(name, val))); } /** Create a boolean switch value. Presence of the option sets the value. */ @@ -163,10 +162,12 @@ struct Options : public po::options_description { */ struct CommonOptions : public Options { QPID_COMMON_EXTERN CommonOptions(const std::string& name=std::string(), - const std::string& configfile=std::string()); + const std::string& configfile=std::string(), + const std::string& clientConfigFile=std::string()); bool help; bool version; std::string config; + std::string clientConfig; }; |