[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  288a4c8207119505123121a7e27a01ba74dc9674 (commit)
       via  e36018867707bae92235da910ec72fa6adfddf10 (commit)
      from  c7c269f43ccecd9066cbd0f6650eca296e3d6faa (commit)

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


- Log -----------------------------------------------------------------
commit 288a4c8207119505123121a7e27a01ba74dc9674
Merge: c7c269f e360188
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Apr 22 14:27:47 2011 -0230

    Merge fix to prevent shadow violation warnings in AMD generated code.


commit e36018867707bae92235da910ec72fa6adfddf10
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Apr 22 14:24:16 2011 -0230

    Modify the slice2cpp translator to avoid shadow warnings in AMD related
    generated code.

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 04d0a41..16569d3 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -6592,10 +6592,6 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
         for(r = throws.begin(); r != throws.end(); ++r)
         {
             C << nl;
-            if(r != throws.begin())
-            {
-                C << "else ";
-            }
             C << "if(const " << fixKwd((*r)->scoped()) << "* __ex = dynamic_cast<const " << fixKwd((*r)->scoped())
             << "*>(&ex))";
             C << sb;
@@ -6604,10 +6600,9 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
             C << nl << "__os()->write(*__ex);";
             C << nl << "__response(false);";
             C << eb;
+            C << nl << "return;";
             C << eb;
         }
-        C << nl << "else";
-        C << sb;
         C.zeroIndent();
         C << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
         C.restoreIndent();
@@ -6620,7 +6615,6 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
         C << nl << "#endif";
         C.restoreIndent();
         C << eb;
-        C << eb;
     }
 }
 

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


-- 
asterisk-scf/release/ice.git