diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:35 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:35 -0400 |
| commit | 298bccf0b6243f2cd741af59b1547b915128356b (patch) | |
| tree | aff10041d00b5aec3413e620db079cc735c83375 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Revert "Replaced double underscores in C# mapping by ice-prefix names" (diff) | |
| download | ice-298bccf0b6243f2cd741af59b1547b915128356b.tar.bz2 ice-298bccf0b6243f2cd741af59b1547b915128356b.tar.xz ice-298bccf0b6243f2cd741af59b1547b915128356b.zip | |
Revert "Reverted previous double-underscore changes in IceUtil classes"
This reverts commit 2e6243dd2955e6a292bbe8a569d4e1711253746a.
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index f8bd97508fb..bbdff8765af 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -269,7 +269,7 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string& { out << nl << "if(" << escapedParamName << ")"; out << sb; - out << nl << paramName << ".__setIsSet();"; + out << nl << paramName << ".iceSetIsSet();"; out << nl << "if(!" << escapedParamName << "->empty())"; out << sb; out << nl << paramName << "->first" << " = &(*" << escapedParamName << ")[0];"; @@ -301,7 +301,7 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string& { out << nl << "if(" << escapedParamName << ")"; out << sb; - out << nl << paramName << ".__setIsSet();"; + out << nl << paramName << ".iceSetIsSet();"; out << nl << paramName << "->first = (*" << escapedParamName << ").begin();"; out << nl << paramName << "->second = (*" << escapedParamName << ").end();"; out << eb; |