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/slice2freezej/Main.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/slice2freezej/Main.cpp')
| -rw-r--r-- | cpp/src/slice2freezej/Main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 7efb1e5aeb1..70d31cc442f 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -11,6 +11,10 @@ #include <Slice/Preprocessor.h> #include <Slice/JavaUtil.h> +#ifdef __BCPLUSPLUS__ +# include <iterator> +#endif + using namespace std; using namespace Slice; using namespace IceUtil; @@ -421,7 +425,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) out << eb; string countMethod = dict.indices[i].member.empty() ? - "valueCount" : dict.indices[i].member + "Count"; + string("valueCount") : dict.indices[i].member + "Count"; out << sp << nl << "public int"; out << nl << countMethod << "(" << typeToString(indexTypes[i], TypeModeIn) << " __index)"; @@ -1103,7 +1107,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) { |