diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-21 11:39:40 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-21 11:39:40 -0400 |
| commit | d2b0b523f878a2db545e03610836ff342888a67c (patch) | |
| tree | 1519565b15c643ba657d39e86389ec88de91e008 /cpp/include/Slice/CPlusPlusUtil.h | |
| parent | Reverted temp debug addition to StreamI.cpp (diff) | |
| download | ice-d2b0b523f878a2db545e03610836ff342888a67c.tar.bz2 ice-d2b0b523f878a2db545e03610836ff342888a67c.tar.xz ice-d2b0b523f878a2db545e03610836ff342888a67c.zip | |
Partial fix for ICE-3393:
- cpp:protobuf is now an alias for cpp:type
- StreamTraitType is now extensible
- StreamTrait<> has now a third template parameter, typename Enabler = void, for std::enable_if expressions
Diffstat (limited to 'cpp/include/Slice/CPlusPlusUtil.h')
| -rw-r--r-- | cpp/include/Slice/CPlusPlusUtil.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index f738f5036c3..5911961e2aa 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -55,7 +55,6 @@ SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList SLICE_API std::string getEndArg(const TypePtr&, const StringList&, const std::string&); SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&); -SLICE_API std::string findMetaData(const SequencePtr&, const StringList&, bool&, int = 0); SLICE_API std::string findMetaData(const StringList&, int = 0); SLICE_API bool inWstringModule(const SequencePtr&); |