summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-02-07 14:49:08 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2016-02-07 14:49:08 +0000
commit2604eed40fe83e1c5bd8dab43ae26ba6aec093d4 (patch)
tree89714d37fe1d2edc72f3637c9098607413171ac3
parentDefault to compiling c++1y, fully stripped and gc'ed (diff)
downloadproject2-1.2.5.1.tar.bz2
project2-1.2.5.1.tar.xz
project2-1.2.5.1.zip
Don't require ModelPartFor compat wrapperproject2-1.2.5.1
-rw-r--r--project2/ice/slice2Daemon.cpp2
-rw-r--r--project2/ice/slice2Rows.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/project2/ice/slice2Daemon.cpp b/project2/ice/slice2Daemon.cpp
index 41e71f1..e9d7922 100644
--- a/project2/ice/slice2Daemon.cpp
+++ b/project2/ice/slice2Daemon.cpp
@@ -50,7 +50,7 @@ Slice2Daemon::visitOperation(const Slice::OperationPtr & o)
visitParameterMap(o);
if (o->returnType()) {
fprintf(code, "\t\t\t\t%s rtn;\n", returnTypeToString(o->returnType(), o->returnIsOptional()).c_str());
- fprintf(code, "\t\t\t\tSlicer::ModelPartPtr mpp = Slicer::ModelPartFor(rtn);\n");
+ fprintf(code, "\t\t\t\tSlicer::ModelPartPtr mpp = Slicer::ModelPart::CreateFor(rtn);\n");
fprintf(code, "\t\t\t\texecuteView(\"%s/%s/%s\", mpp, params);\n", module.c_str(), interface.c_str(), o->name().c_str());
fprintf(code, "\t\t\t\treturn rtn;\n");
}
diff --git a/project2/ice/slice2Rows.cpp b/project2/ice/slice2Rows.cpp
index cbc002a..8fa17b8 100644
--- a/project2/ice/slice2Rows.cpp
+++ b/project2/ice/slice2Rows.cpp
@@ -59,7 +59,7 @@ Slice2Rows::visitOperation(const Slice::OperationPtr & o)
fprintf(code, "\t\t\t\t\t\tauto result = ");
CallOperation(o);
fprintf(code, ";\n");
- fprintf(code, "\t\t\t\t\t\tSlicer::ModelPartPtr mp = Slicer::ModelPartFor(result);\n");
+ fprintf(code, "\t\t\t\t\t\tSlicer::ModelPartPtr mp = Slicer::ModelPart::CreateFor(result);\n");
fprintf(code, "\t\t\t\t\t\ttoRpc->Serialize(mp);\n");
fprintf(code, "\t\t\t\t\t}\n\n");
ParameterVariables(o);