diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
| commit | 08ec7524df324e627bbb8d93c509f0d90badbe3b (patch) | |
| tree | a640ae99a5e35b210352150feef4f71832b265c5 /php/src/IcePHP/Profile.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.bz2 ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.xz ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.zip | |
IceUtil cleanup (first commit)
Diffstat (limited to 'php/src/IcePHP/Profile.cpp')
| -rw-r--r-- | php/src/IcePHP/Profile.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/php/src/IcePHP/Profile.cpp b/php/src/IcePHP/Profile.cpp index cfcec99eeda..ec4c5e5bbe0 100644 --- a/php/src/IcePHP/Profile.cpp +++ b/php/src/IcePHP/Profile.cpp @@ -12,6 +12,7 @@ #include <Slice/Preprocessor.h> #include <IceUtil/Options.h> +#include <IceUtil/InputUtil.h> #include <fstream> using namespace std; @@ -319,7 +320,7 @@ parseSlice(const string& argStr, Slice::UnitPtr& unit, bool& suppressWarnings TS vector<string> args; try { - args = IceUtil::Options::split(argStr); + args = IceUtilInternal::Options::split(argStr); } catch(const IceUtil::Exception& ex) { @@ -331,10 +332,10 @@ parseSlice(const string& argStr, Slice::UnitPtr& unit, bool& suppressWarnings TS return false; } - IceUtil::Options opts; - opts.addOpt("D", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat); - opts.addOpt("U", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat); - opts.addOpt("I", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat); + IceUtilInternal::Options opts; + opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); + opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); + opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "case-sensitive"); @@ -460,7 +461,7 @@ createProfile(const string& name, const string& config, const string& options, c vector<string> args; try { - args = IceUtil::Options::split(options); + args = IceUtilInternal::Options::split(options); } catch(const IceUtil::Exception& ex) { @@ -1194,7 +1195,7 @@ IcePHP::CodeVisitor::visitConst(const Slice::ConstPtr& p) case Slice::Builtin::KindLong: { IceUtil::Int64 l; - IceUtil::stringToInt64(value, l); + IceUtilInternal::stringToInt64(value, l); // // The platform's 'long' type may not be 64 bits, so we store 64-bit // values as a string. |