summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2006-01-05 14:19:13 +0000
committerMark Spruiell <mes@zeroc.com>2006-01-05 14:19:13 +0000
commit5c770a0838c31853ab638e3eb1b81dc735fc22e5 (patch)
tree76fc77846b3bf72b772cf200358813f3893c454a /cpp/src
parentFix for .NET 2.0 compatibility. Fixes to satisfy VB 2005 compiler warnings. (diff)
downloadice-5c770a0838c31853ab638e3eb1b81dc735fc22e5.tar.bz2
ice-5c770a0838c31853ab638e3eb1b81dc735fc22e5.tar.xz
ice-5c770a0838c31853ab638e3eb1b81dc735fc22e5.zip
Fix for .NET 2.0 compatibility
Diffstat (limited to 'cpp/src')
-rwxr-xr-xcpp/src/slice2cs/Gen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 6eb86ff80ce..298fe1a280c 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -1653,7 +1653,8 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
_out << sp << nl << "#region ArrayList members";
- _out << sp << nl << "public virtual int Capacity";
+ _out << sp << nl << "#if !DOTNET_2X";
+ _out << nl << "public virtual int Capacity";
_out << sb;
_out << nl << "get";
_out << sb;
@@ -1664,6 +1665,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
_out << nl << "InnerList.Capacity = value;";
_out << eb;
_out << eb;
+ _out << nl << "#endif";
_out << sp << nl << "public virtual void TrimToSize()";
_out << sb;