diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 14:58:01 +0000 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 14:58:01 +0000 |
commit | 3f862089b748741b30e343d2051a4747a3bff2f2 (patch) | |
tree | 18d1dde1504e2d510a24f4d55aeee21bfea7c04f /cpp/src/IcePatch2/Calc.cpp | |
parent | fixing bug 1291 (diff) | |
download | ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.bz2 ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.xz ice-3f862089b748741b30e343d2051a4747a3bff2f2.zip |
Borland C++Builder port mass commit
Diffstat (limited to 'cpp/src/IcePatch2/Calc.cpp')
-rw-r--r-- | cpp/src/IcePatch2/Calc.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp index 42386286936..dfe342c7018 100644 --- a/cpp/src/IcePatch2/Calc.cpp +++ b/cpp/src/IcePatch2/Calc.cpp @@ -12,6 +12,10 @@ #include <IcePatch2/Util.h> #include <OS.h> +#ifdef __BCPLUSPLUS__ +# include <iterator> +#endif + using namespace std; using namespace Ice; using namespace IcePatch2; @@ -128,7 +132,7 @@ main(int argc, char* argv[]) vector<string> args; try { - args = opts.parse(argc, argv); + args = opts.parse(argc, (const char**)argv); } catch(const IceUtil::Options::BadOpt& e) { |