diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
| commit | a9207c4a7e8190cb64286afc1b373f16010d0feb (patch) | |
| tree | b6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/src/Slice/CPlusPlusUtil.h | |
| parent | Revert "Reverted previous double-underscore changes in IceUtil classes" (diff) | |
| download | ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2 ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip | |
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.h')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h index 3c6dcc652c2..0e359b9a1a7 100644 --- a/cpp/src/Slice/CPlusPlusUtil.h +++ b/cpp/src/Slice/CPlusPlusUtil.h @@ -52,8 +52,7 @@ void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, bool, const StringList& = StringList(), int = 0, const std::string& = "", bool = true, const std::string& = ""); -void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0, - const std::string& = ""); +void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0); void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0, const std::string& = "", const std::string& = ""); void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0); |