diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-14 12:33:40 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-14 12:33:40 -0500 |
| commit | 056be10c243e52fd923b431e31ab3f6e9bbf5127 (patch) | |
| tree | 06715de82bfd53f5a63a30d0774c5818929ea3ae /cpp/src | |
| parent | Fixed bug #2605 (diff) | |
| parent | Fixed some .gitignore files (diff) | |
| download | ice-056be10c243e52fd923b431e31ab3f6e9bbf5127.tar.bz2 ice-056be10c243e52fd923b431e31ab3f6e9bbf5127.tar.xz ice-056be10c243e52fd923b431e31ab3f6e9bbf5127.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src')
| -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); |