Fixed ICE-5402 - VS2010: generated code does not compile if method has more than 10 out parameters

3 files changed, 24 insertions, 0 deletions

diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice
index ef2fb34d133..fc56c5b3660 100644
--- a/cpp/test/Ice/ami/Test.ice
+++ b/cpp/test/Ice/ami/Test.ice
@@ -27,6 +27,9 @@ interface TestIntf
     void opWithUE()
         throws TestIntfException;    
     void opBatch();
+
+    void opWitArgs(out int one, out int two, out int three, out int four, out int five, out int six, out int seven, 
+                   out int eight, out int nine, out int ten, out int eleven);
     int opBatchCount();
     bool waitForBatch(int count);
     void close(bool force);
diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp
index e4b4b59a1a4..cc59376d94e 100644
--- a/cpp/test/Ice/ami/TestI.cpp
+++ b/cpp/test/Ice/ami/TestI.cpp
@@ -55,6 +55,24 @@ TestIntfI::opBatchCount(const Ice::Current&)
     return _batchCount;
 }
 
+void
+TestIntfI::opWitArgs(Ice::Int& one, Ice::Int& two, Ice::Int& three, Ice::Int& four, Ice::Int& five, Ice::Int& six,
+                     Ice::Int& seven, Ice::Int& eight, Ice::Int& nine, Ice::Int& ten, Ice::Int& eleven,
+                     const Ice::Current&)
+{
+    one = 1;
+    two = 2;
+    three = 3;
+    four = 4;
+    five = 5;
+    six = 6;
+    seven = 7;
+    eight = 8;
+    nine = 9;
+    ten = 10;
+    eleven = 11;
+}
+
 bool
 TestIntfI::waitForBatch(Ice::Int count, const Ice::Current&)
 {
@@ -95,3 +113,4 @@ TestIntfControllerI::resumeAdapter(const Ice::Current&)
 TestIntfControllerI::TestIntfControllerI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter)
 {
 }
+
diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
index 8e5ed7b1fa3..e1a66c302d3 100644
--- a/cpp/test/Ice/ami/TestI.h
+++ b/cpp/test/Ice/ami/TestI.h
@@ -27,6 +27,8 @@ public:
     virtual void opWithPayload(const Ice::ByteSeq&, const Ice::Current&);
     virtual void opBatch(const Ice::Current&);
     virtual Ice::Int opBatchCount(const Ice::Current&);
+    virtual void opWitArgs(Ice::Int&, Ice::Int&, Ice::Int&, Ice::Int&, Ice::Int&, Ice::Int&, Ice::Int&,
+                           Ice::Int&, Ice::Int&, Ice::Int&, Ice::Int&, const Ice::Current&);
     virtual bool waitForBatch(Ice::Int, const Ice::Current&);
     virtual void close(bool, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);