diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-02-06 14:21:00 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-02-06 14:21:00 +0000 |
| commit | 79496603519f5356862f5bd537dd0b161d33d4be (patch) | |
| tree | 9d445c1157b839098e3276dcaa10328b00866fc2 /cpp/src/slice2cppe/Gen.cpp | |
| parent | Fixed one-shot constructors. (diff) | |
| download | ice-79496603519f5356862f5bd537dd0b161d33d4be.tar.bz2 ice-79496603519f5356862f5bd537dd0b161d33d4be.tar.xz ice-79496603519f5356862f5bd537dd0b161d33d4be.zip | |
Added support for alternate sequences Added custom test
Diffstat (limited to 'cpp/src/slice2cppe/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index de880d6f56d..d5e16aa66ba 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -2339,7 +2339,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) writeAllocateCode(C, inParams, 0, StringList(), true); writeUnmarshalCode(C, inParams, 0, StringList(), true); - writeAllocateCode(C, outParams, 0); + writeAllocateCode(C, outParams, 0, StringList()); if(!throws.empty()) { C << nl << "try"; @@ -2998,7 +2998,7 @@ Slice::Gen::MetaDataVisitor::visitOperation(const OperationPtr& p) { for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); ++q) { - if(q->find("cpp:type:", 0) == 0 || q->find("cpp:array", 0) || q->find("cpp:range", 0)) + if(q->find("cpp:type:", 0) == 0 || q->find("cpp:array", 0) == 0 || q->find("cpp:range", 0) == 0) { cout << p->definitionContext()->filename() << ":" << p->line() << ": warning: invalid metadata for operation" << endl; @@ -3060,7 +3060,6 @@ void Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const StringList& metaData, const string& file, const string& line, bool inParam) { - static const string prefix = "cpp:"; for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p) { @@ -3097,7 +3096,7 @@ Slice::Gen::printHeader(Output& out) static const char* header = "// **********************************************************************\n" "//\n" -"// Copyright (c) 2005 ZeroC, Inc. All rights reserved.\n" +"// Copyright (c) 2005-2006 ZeroC, Inc. All rights reserved.\n" "//\n" "// This copy of Ice-E is licensed to you under the terms described in the\n" "// ICEE_LICENSE file included in this distribution.\n" |