* Minor C++ fixes

* Adding UnknownSlicedObject in Java

1 files changed, 27 insertions, 28 deletions

diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp
index 4e7251af410..22de9e2cb6e 100644
--- a/cpp/test/Ice/optional/TestI.cpp
+++ b/cpp/test/Ice/optional/TestI.cpp
@@ -31,10 +31,9 @@ InitialI::pingPong(const ObjectPtr& obj, const Current&)
     return obj;
 }
 
-
 void
-InitialI::opOptionalException(const Optional<Int>& a, 
-                              const Optional<string>& b, 
+InitialI::opOptionalException(const Optional<Int>& a,
+                              const Optional<string>& b,
                               const Optional<OneOptionalPtr>& o,
                               const Ice::Current&)
 {
@@ -45,86 +44,87 @@ InitialI::opOptionalException(const Optional<Int>& a,
     throw ex;
 }
 
-Optional<Byte> 
-InitialI::opByte(const Optional<Byte>& p1, Optional<Byte>& p3, const Current&)
+Optional<Ice::Byte>
+InitialI::opByte(const Optional<Ice::Byte>& p1, Optional<Ice::Byte>& p3, const Current&)
 {
     p3 = p1;
     return p1;
 }
 
-Optional<Long> 
+Optional<Long>
 InitialI::opLong(const Optional<Long>& p1, Optional<Long>& p3, const Current&)
 {
     p3 = p1;
     return p1;
 }
 
-Optional<string> 
+Optional<string>
 InitialI::opString(const Optional<string>& p1, Optional<string>& p3, const Current&)
 {
     p3 = p1;
     return p1;
 }
 
-Optional<OneOptionalPtr> 
+Optional<OneOptionalPtr>
 InitialI::opOneOptional(const Optional<OneOptionalPtr>& p1, Optional<OneOptionalPtr>& p3, const Current&)
 {
     p3 = p1;
     return p1;
 }
 
-Optional<OneOptionalPrx> 
+Optional<OneOptionalPrx>
 InitialI::opOneOptionalProxy(const Optional<OneOptionalPrx>& p1, Optional<OneOptionalPrx>& p3, const Current&)
 {
     p3 = p1;
     return p1;
 }
 
-Optional<ByteSeq> 
-InitialI::opByteSeq(const Optional<pair<const Byte*, const Byte*> >& p1, Optional<ByteSeq>& p3, const Current&)
+Optional<Ice::ByteSeq>
+InitialI::opByteSeq(const Optional<pair<const Ice::Byte*, const Ice::Byte*> >& p1, Optional<Ice::ByteSeq>& p3,
+                    const Current&)
 {
     if(p1)
     {
-        p3 = ByteSeq(p1->first, p1->second);
+        p3 = Ice::ByteSeq(p1->first, p1->second);
     }
     return p3;
 }
 
-Optional<ShortSeq> 
-InitialI::opShortSeq(const Optional<pair<const Short*, const Short*> >& p1, Optional<ShortSeq>& p3, const Current&)
+Optional<Ice::ShortSeq>
+InitialI::opShortSeq(const Optional<pair<const Short*, const Short*> >& p1, Optional<Ice::ShortSeq>& p3, const Current&)
 {
     if(p1)
     {
-        p3 = ShortSeq(p1->first, p1->second);
+        p3 = Ice::ShortSeq(p1->first, p1->second);
     }
     return p3;
 }
 
-Optional<BoolSeq> 
-InitialI::opBoolSeq(const Optional<pair<const bool*, const bool*> >& p1, Optional<BoolSeq>& p3, const Current&)
+Optional<Ice::BoolSeq>
+InitialI::opBoolSeq(const Optional<pair<const bool*, const bool*> >& p1, Optional<Ice::BoolSeq>& p3, const Current&)
 {
     if(p1)
     {
-        p3 = BoolSeq(p1->first, p1->second);
+        p3 = Ice::BoolSeq(p1->first, p1->second);
     }
     return p3;
 }
 
-Optional<StringSeq> 
-InitialI::opStringSeq(const Optional<pair<StringSeq::const_iterator, StringSeq::const_iterator> >& p1,
-                      Optional<StringSeq>& p3, 
+Optional<Ice::StringSeq>
+InitialI::opStringSeq(const Optional<pair<Ice::StringSeq::const_iterator, Ice::StringSeq::const_iterator> >& p1,
+                      Optional<Ice::StringSeq>& p3,
                       const Current&)
 {
     if(p1)
     {
-        p3 = StringSeq(p1->first, p1->second);
+        p3 = Ice::StringSeq(p1->first, p1->second);
     }
     return p3;
 }
 
-Optional<FixedStructSeq> 
+Optional<FixedStructSeq>
 InitialI::opFixedStructSeq(const Optional<pair<const FixedStruct*, const FixedStruct*> >& p1,
-                           Optional<FixedStructSeq>& p3, 
+                           Optional<FixedStructSeq>& p3,
                            const Current&)
 {
     if(p1)
@@ -133,10 +133,10 @@ InitialI::opFixedStructSeq(const Optional<pair<const FixedStruct*, const FixedSt
     }
     return p3;
 }
-    
-Optional<VarStructSeq> 
+
+Optional<VarStructSeq>
 InitialI::opVarStructSeq(const Optional<pair<VarStructSeq::const_iterator, VarStructSeq::const_iterator> >& p1,
-                         Optional<VarStructSeq>& p3, 
+                         Optional<VarStructSeq>& p3,
                          const Current&)
 {
     if(p1)
@@ -150,4 +150,3 @@ void
 InitialI::opClassAndUnknownOptional(const APtr& a, const Ice::Current&)
 {
 }
-