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/slice2freeze/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/slice2freeze/Main.cpp')
| -rw-r--r-- | cpp/src/slice2freeze/Main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 8c051ecdb55..12e31fd74aa 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -457,7 +457,7 @@ writeDictWithIndicesH(const string& name, const Dict& dict, << capitalizedMembers[i] << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ") const;"; - string countFunction = dict.indices[i].member.empty() ? "valueCount" + string countFunction = dict.indices[i].member.empty() ? string("valueCount") : dict.indices[i].member + "Count"; H << nl << "int " << countFunction @@ -745,7 +745,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di << "(__index), upperBoundFor" << capitalizedMembers[i] << "(__index));"; C << eb; - string countFunction = dict.indices[i].member.empty() ? "valueCount" + string countFunction = dict.indices[i].member.empty() ? string("valueCount") : dict.indices[i].member + "Count"; C << sp << nl << "int" @@ -1213,7 +1213,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) { |