diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-02-18 01:07:06 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-02-18 01:07:06 +0000 |
| commit | 8105074060968dc37e1516d8a8d3cfcffc2a9d36 (patch) | |
| tree | 3a754e2d6d93bacf760069c6f1c7a82f80886e6a /cpp/src/IceUtil/Options.cpp | |
| parent | fixed release warnings (diff) | |
| download | ice-8105074060968dc37e1516d8a8d3cfcffc2a9d36.tar.bz2 ice-8105074060968dc37e1516d8a8d3cfcffc2a9d36.tar.xz ice-8105074060968dc37e1516d8a8d3cfcffc2a9d36.zip | |
Fixed Sun CC build
Diffstat (limited to 'cpp/src/IceUtil/Options.cpp')
| -rwxr-xr-x | cpp/src/IceUtil/Options.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp index 9dcd795af4a..fb87c556b2f 100755 --- a/cpp/src/IceUtil/Options.cpp +++ b/cpp/src/IceUtil/Options.cpp @@ -166,13 +166,13 @@ IceUtil::Options::parse(int argc, char* argv[]) pos = checkOpt(opt, ShortOpt); if(pos->second.arg == NeedArg && *(p + 1) != '\0') { - string optarg; + string optArg; while(*++p != '\0') { - optarg.push_back(*p); + optArg.push_back(*p); } --p; - setOpt(opt, optarg, pos->second.repeat); + setOpt(opt, optArg, pos->second.repeat); argDone = true; } } @@ -303,7 +303,7 @@ IceUtil::Options::addValidOpt(const string& opt, LengthType lt, ArgType at, cons od.arg = at; od.repeat = rt; - _validOpts.insert(pos, make_pair(opt, od)); + _validOpts.insert(pos, ValidOpts::value_type(opt, od)); if(at == NeedArg && !dflt.empty()) { @@ -355,7 +355,7 @@ IceUtil::Options::setOpt(const string& opt, const string& val, RepeatType rt) { vector<string> vec; vec.push_back(val); - _ropts.insert(pos, make_pair(opt, vec)); + _ropts.insert(pos, ROpts::value_type(opt, vec)); } } else |