[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  33cf82079005773f2d755b68a8859b75ef62456a (commit)
       via  943d60b77a242b74f56ae3399bafa6052bf0d485 (commit)
      from  4dc2a1d776a6bda63a5fd2240514e1ff69ea9d45 (commit)

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


- Log -----------------------------------------------------------------
commit 33cf82079005773f2d755b68a8859b75ef62456a
Merge: 4dc2a1d 943d60b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Feb 18 13:22:33 2011 -0600

    Merge branch 'slice2cs-data-member-fix'


commit 943d60b77a242b74f56ae3399bafa6052bf0d485
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Feb 18 13:21:43 2011 -0600

    Commit patch from Brent to make slice2cs properly determine whether any
    base classes have data members.

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 7a089e9..55aae83 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -756,7 +756,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             emitGeneratedCodeAttribute();
         }
         _out << nl << "public sealed ";
-        if(hasBaseClass && bases.front()->declaration()->usesClasses())
+        if(hasBaseClass && bases.front()->allClassDataMembers().size() != 0)
         {
             _out << "new ";
         }
@@ -2896,7 +2896,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << sp;
             emitGeneratedCodeAttribute();
             _out << nl << "public sealed ";
-            if(base && base->usesClasses())
+            if(base && base->allClassDataMembers().size() != 0)
             {
                 _out << "new ";
             }

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


-- 
asterisk-scf/release/ice.git