diff options
| author | ZeroC Staff <git@zeroc.com> | 2007-12-14 14:39:49 -0500 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2007-12-14 14:39:49 -0500 |
| commit | 9c66a24cd66a241cb414413c66f5cc1debd13f88 (patch) | |
| tree | e561b21ee4e1bb714479b34f8af0a8567cc7d32c /cpp/src/Slice/CsUtil.cpp | |
| parent | Fixed vc60 msi build (diff) | |
| parent | Fixed Windows build (diff) | |
| download | ice-9c66a24cd66a241cb414413c66f5cc1debd13f88.tar.bz2 ice-9c66a24cd66a241cb414413c66f5cc1debd13f88.tar.xz ice-9c66a24cd66a241cb414413c66f5cc1debd13f88.zip | |
Merge branch 'master' of bernard@cvs.zeroc.com:/home/git/ice
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 9b9c7c801c2..82c2281b0da 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -174,7 +174,7 @@ Slice::CsGenerator::typeToString(const TypePtr& type) "string", "Ice.Object", "Ice.ObjectPrx", - "System.Object" + "_System.Object" }; BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); |