[asterisk-scf-commits] asterisk-scf/integration/slice-plugins.git branch "ice-3.4.2" updated.

[Commits to the Asterisk SCF project code repositories]

branch "ice-3.4.2" has been updated
  discards  dc6ca809ded80806cd63d8daf44b826aae426dc0 (commit)
       via  5a2010bc3a7008c761346f1cc3c6cc4f0bb65594 (commit)
       via  20f2e7aba90cbe19de308db275989538ae8f5080 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (dc6ca809ded80806cd63d8daf44b826aae426dc0)
            \
             N -- N -- N (5a2010bc3a7008c761346f1cc3c6cc4f0bb65594)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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


- Log -----------------------------------------------------------------
commit 5a2010bc3a7008c761346f1cc3c6cc4f0bb65594
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jun 22 13:40:29 2011 -0500

    Generate floating point default values properly.

diff --git a/src/SliceClassMemberDefault.cpp b/src/SliceClassMemberDefault.cpp
index 92301b1..a2feaca 100644
--- a/src/SliceClassMemberDefault.cpp
+++ b/src/SliceClassMemberDefault.cpp
@@ -43,9 +43,11 @@ ClassMemberDefaultVisitor::visitDataMember(const DataMemberPtr& p)
 		case Builtin::KindShort:
 		case Builtin::KindInt:
 		case Builtin::KindLong:
+			p->setDefaultValue(builtin, "0");
+			break;
 		case Builtin::KindFloat:
 		case Builtin::KindDouble:
-			p->setDefaultValue(builtin, "0");
+			p->setDefaultValue(builtin, "0.0");
 			break;
 		case Builtin::KindBool:
 			p->setDefaultValue(builtin, "false");

commit 20f2e7aba90cbe19de308db275989538ae8f5080
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jun 22 07:36:51 2011 -0500

    Update for Ice 3.4.2 default value handling.

diff --git a/src/SliceClassMemberDefault.cpp b/src/SliceClassMemberDefault.cpp
index 69c0785..92301b1 100644
--- a/src/SliceClassMemberDefault.cpp
+++ b/src/SliceClassMemberDefault.cpp
@@ -29,7 +29,7 @@ public:
 void
 ClassMemberDefaultVisitor::visitDataMember(const DataMemberPtr& p)
 {
-	if(p->hasDefaultValue())
+	if(p->defaultValueType())
 	{
 		return;
 	}
@@ -45,10 +45,10 @@ ClassMemberDefaultVisitor::visitDataMember(const DataMemberPtr& p)
 		case Builtin::KindLong:
 		case Builtin::KindFloat:
 		case Builtin::KindDouble:
-			p->setDefaultValue("0");
+			p->setDefaultValue(builtin, "0");
 			break;
 		case Builtin::KindBool:
-			p->setDefaultValue("false");
+			p->setDefaultValue(builtin, "false");
 			break;
 		default:
 			break;
@@ -61,7 +61,7 @@ ClassMemberDefaultVisitor::visitDataMember(const DataMemberPtr& p)
 	if(enumtype)
 	{
 		EnumeratorPtr enumerator = enumtype->getEnumerators().front();
-		p->setDefaultValue(enumerator->name());
+		p->setDefaultValue(enumtype, enumerator->name());
 		return;
 	}
 }

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


-- 
asterisk-scf/integration/slice-plugins.git