summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cppe
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-04-05 11:27:37 +0000
committerBrent Eagles <brent@zeroc.com>2005-04-05 11:27:37 +0000
commit39c3a0f56b6dc3b4e9c43c2a08ec0e8bfb01015d (patch)
treebaa4226358702a82ca34cef2e19c3b8ab39512ea /cpp/src/slice2cppe
parentfix for bug 178 (diff)
downloadice-39c3a0f56b6dc3b4e9c43c2a08ec0e8bfb01015d.tar.bz2
ice-39c3a0f56b6dc3b4e9c43c2a08ec0e8bfb01015d.tar.xz
ice-39c3a0f56b6dc3b4e9c43c2a08ec0e8bfb01015d.zip
Removing class support from slice2javae and slice2cppe translators.
removed generation of object marshalling code added validation code for parsers added feature set flag to slice parser library (defaults to Ice feature set)
Diffstat (limited to 'cpp/src/slice2cppe')
-rw-r--r--cpp/src/slice2cppe/Gen.cpp11
-rw-r--r--cpp/src/slice2cppe/Main.cpp2
2 files changed, 3 insertions, 10 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 0ea98bc91ff..2b1a50518c8 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -2607,16 +2607,13 @@ Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePt
out << " = 0.0";
break;
}
+ case Builtin::KindObject:
case Builtin::KindString:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
{
break;
}
- case Builtin::KindObject: // XXX we should do something about this not being permitted here.
- {
- assert("Slice classes not support in IceE" == 0);
- }
}
}
@@ -2662,17 +2659,13 @@ Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type)
out << nl << "return ::std::string();";
break;
}
+ case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
{
out << nl << "return 0;";
break;
}
- case Builtin::KindObject: // XXX we should do something about this not being permitted here.
- {
- assert("Slice classes not support in IceE" == 0);
- }
-
}
}
else
diff --git a/cpp/src/slice2cppe/Main.cpp b/cpp/src/slice2cppe/Main.cpp
index 87a5f82ebfd..0b463233774 100644
--- a/cpp/src/slice2cppe/Main.cpp
+++ b/cpp/src/slice2cppe/Main.cpp
@@ -189,7 +189,7 @@ main(int argc, char* argv[])
else
{
UnitPtr u = Unit::createUnit(false, false, ice, caseSensitive);
- int parseStatus = u->parse(cppHandle, debug);
+ int parseStatus = u->parse(cppHandle, debug, Slice::IceE);
if(!icecpp.close())
{