[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  8700edd5731a965944f28dc1eb39b26e5a6bc763 (commit)
      from  46dcb6eb87508eb7954580938dd6dd9d04f65af6 (commit)

Summary of changes:
 cpp/src/slice2cs/Gen.cpp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 8700edd5731a965944f28dc1eb39b26e5a6bc763
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Nov 5 16:28:12 2010 -0230

    Fix generation error where the aliased System namespace wasn't being specified.

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 0a75be5..ae56cbc 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -905,7 +905,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             _out << eb;
         }
         _out << eb;
-        _out << nl << "catch(System.InvalidCastException)";
+        _out << nl << "catch(_System.InvalidCastException)";
         _out << sb;
         _out << nl << "IceInternal.Ex.throwUOE(_typeId, v.ice_id());";
         _out << eb;
@@ -3203,7 +3203,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
                 _out << eb;
             }
             _out << eb;
-            _out << nl << "catch(System.InvalidCastException)";
+            _out << nl << "catch(_System.InvalidCastException)";
             _out << sb;
             _out << nl << "IceInternal.Ex.throwUOE(_typeId, v.ice_id());";
             _out << eb;
@@ -3639,7 +3639,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                 _out << eb;
             }
             _out << eb;
-            _out << nl << "catch(System.InvalidCastException)";
+            _out << nl << "catch(_System.InvalidCastException)";
             _out << sb;
             _out << nl << "IceInternal.Ex.throwUOE(_typeId, v.ice_id());";
             _out << eb;
@@ -5391,7 +5391,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
         _out << sb;
         _out << nl << "_m[_key] = (" << valueS << ")v;";
         _out << eb;
-        _out << nl << "catch(System.InvalidCastException)";
+        _out << nl << "catch(_System.InvalidCastException)";
         _out << sb;
         _out << nl << "IceInternal.Ex.throwUOE(type(), v.ice_id());";
         _out << eb;
@@ -5826,7 +5826,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
                         _out << sb;
                         _out << nl << param << " = (" << type << ")" << param << "_PP.value;";
                         _out << eb;
-                        _out << nl << "catch(System.InvalidCastException)";
+                        _out << nl << "catch(_System.InvalidCastException)";
                         _out << sb;
                         _out << nl << param << " = null;";
                         _out << nl << "IceInternal.Ex.throwUOE(" << param << "_PP.type(), "
@@ -5851,7 +5851,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
                 _out << sb;
                 _out << nl << "ret__ = (" << retS << ")ret___PP.value;";
                 _out << eb;
-                _out << nl << "catch(System.InvalidCastException)";
+                _out << nl << "catch(_System.InvalidCastException)";
                 _out << sb;
                 _out << nl << "ret__ = null;";
                 _out << nl << "IceInternal.Ex.throwUOE(ret___PP.type(), ret___PP.value.ice_id());";
@@ -6082,7 +6082,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
             _out << sb;
             _out << nl << "throw;";
             _out << eb;
-            _out << nl << "catch(System.Exception ex__)";
+            _out << nl << "catch(_System.Exception ex__)";
             _out << sb;
             _out << nl << "IceInternal.LocalExceptionWrapper.throwWrapper(ex__);";
             _out << eb;

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git