diff options
Diffstat (limited to 'cpp/src/slice2py')
| -rw-r--r-- | cpp/src/slice2py/.depend | 2 | ||||
| -rw-r--r-- | cpp/src/slice2py/Main.cpp | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/cpp/src/slice2py/.depend b/cpp/src/slice2py/.depend index fd401ea8eec..2c6cdc4d722 100644 --- a/cpp/src/slice2py/.depend +++ b/cpp/src/slice2py/.depend @@ -1 +1 @@ -Main$(OBJEXT): Main.cpp ../../include/IceUtil/DisableWarnings.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Config.h ../../include/IceUtil/AbstractMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Time.h ../../include/IceUtil/Algorithm.h ../../include/IceUtil/ArgVector.h ../../include/IceUtil/Base64.h ../../include/IceUtil/Cache.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/CountDownLatch.h ../../include/IceUtil/Cond.h ../../include/IceUtil/CtrlCHandler.h ../../include/IceUtil/Functional.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/MD5.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Options.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Shared.h ../../include/IceUtil/OutputUtil.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Random.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/StringUtil.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/Timer.h ../../include/Slice/Preprocessor.h ../../include/Slice/PythonUtil.h ../../include/Slice/Parser.h +Main$(OBJEXT): Main.cpp ../../include/IceUtil/DisableWarnings.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Config.h ../../include/IceUtil/AbstractMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Time.h ../../include/IceUtil/Cache.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/CountDownLatch.h ../../include/IceUtil/Cond.h ../../include/IceUtil/CtrlCHandler.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Timer.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Unicode.h ../../include/Slice/Preprocessor.h ../../include/Slice/PythonUtil.h ../../include/Slice/Parser.h ../../include/IceUtil/OutputUtil.h diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp index de1bbf839a2..26f39e36d44 100644 --- a/cpp/src/slice2py/Main.cpp +++ b/cpp/src/slice2py/Main.cpp @@ -9,6 +9,8 @@ #include <IceUtil/DisableWarnings.h> #include <IceUtil/IceUtil.h> +#include <IceUtil/Options.h> +#include <IceUtil/StringUtil.h> #include <Slice/Preprocessor.h> #include <Slice/PythonUtil.h> @@ -116,7 +118,7 @@ PackageVisitor::visitModuleStart(const ModulePtr& p) if(!package.empty()) { vector<string> v; - if(!IceUtil::splitString(package, ".", v)) + if(!IceUtilInternal::splitString(package, ".", v)) { return false; } @@ -384,20 +386,20 @@ usage(const char* n) int main(int argc, char* argv[]) { - IceUtil::Options opts; + IceUtilInternal::Options opts; opts.addOpt("h", "help"); opts.addOpt("v", "version"); - 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); + 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("E"); - opts.addOpt("", "output-dir", IceUtil::Options::NeedArg); + opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg); opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "all"); opts.addOpt("", "no-package"); opts.addOpt("", "checksum"); - opts.addOpt("", "prefix", IceUtil::Options::NeedArg); + opts.addOpt("", "prefix", IceUtilInternal::Options::NeedArg); opts.addOpt("", "case-sensitive"); vector<string> args; @@ -405,7 +407,7 @@ main(int argc, char* argv[]) { args = opts.parse(argc, (const char**)argv); } - catch(const IceUtil::BadOptException& e) + catch(const IceUtilInternal::BadOptException& e) { cerr << argv[0] << ": " << e.reason << endl; usage(argv[0]); @@ -532,7 +534,7 @@ main(int argc, char* argv[]) file = output + '/' + file; } - IceUtil::Output out; + IceUtilInternal::Output out; out.open(file.c_str()); if(!out) { |