diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2002-01-31 14:32:05 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2002-01-31 14:32:05 +0000 |
| commit | 68ec8c36af4f3abe5a10d4f24c924eeb5e8234e1 (patch) | |
| tree | 542c8bc5a76b4ebdeaad6a05b6c5c1b1faaca64d /cpp/include/Slice/CPlusPlusUtil.h | |
| parent | bug fix (diff) | |
| download | ice-68ec8c36af4f3abe5a10d4f24c924eeb5e8234e1.tar.bz2 ice-68ec8c36af4f3abe5a10d4f24c924eeb5e8234e1.tar.xz ice-68ec8c36af4f3abe5a10d4f24c924eeb5e8234e1.zip | |
Move Slice/OutputUtil to IceUtil. Integrate IceXML/Output.cpp with
OutputUtil. Various Makefile fixes.
Diffstat (limited to 'cpp/include/Slice/CPlusPlusUtil.h')
| -rw-r--r-- | cpp/include/Slice/CPlusPlusUtil.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index 2dff68a0674..fff635b57a9 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -12,7 +12,7 @@ #define C_PLUS_PLUS_UTIL_H #include <Slice/Parser.h> -#include <Slice/OutputUtil.h> +#include <IceUtil/OutputUtil.h> namespace Slice { @@ -23,26 +23,31 @@ struct ToIfdef }; SLICE_API std::string changeInclude(const std::string&, const std::vector<std::string>&); -SLICE_API void printHeader(Output&); -SLICE_API void printVersionCheck(Output&); -SLICE_API void printDllExportStuff(Output&, const std::string&); +SLICE_API void printHeader(::IceUtil::Output&); +SLICE_API void printVersionCheck(::IceUtil::Output&); +SLICE_API void printDllExportStuff(::IceUtil::Output&, const std::string&); SLICE_API std::string typeToString(const TypePtr&); SLICE_API std::string returnTypeToString(const TypePtr&); SLICE_API std::string inputTypeToString(const TypePtr&); SLICE_API std::string outputTypeToString(const TypePtr&); -SLICE_API void writeMarshalUnmarshalCode(Output&, const TypePtr&, const std::string&, bool, const std::string& = "", - bool = true); -SLICE_API void writeMarshalCode(Output&, const std::list<std::pair<TypePtr, std::string> >&, const TypePtr&); -SLICE_API void writeUnmarshalCode(Output&, const std::list<std::pair<TypePtr, std::string> >&, const TypePtr&); -SLICE_API void writeAllocateCode(Output&, const std::list<std::pair<TypePtr, std::string> >&, const TypePtr&); +SLICE_API void writeMarshalUnmarshalCode(::IceUtil::Output&, const TypePtr&, const std::string&, bool, + const std::string& = "", bool = true); +SLICE_API void writeMarshalCode(::IceUtil::Output&, const std::list<std::pair<TypePtr, std::string> >&, + const TypePtr&); +SLICE_API void writeUnmarshalCode(::IceUtil::Output&, const std::list<std::pair<TypePtr, std::string> >&, + const TypePtr&); +SLICE_API void writeAllocateCode(::IceUtil::Output&, const std::list<std::pair<TypePtr, std::string> >&, + const TypePtr&); -SLICE_API void writeGenericMarshalUnmarshalCode(Output&, const TypePtr&, const std::string&, bool, +SLICE_API void writeGenericMarshalUnmarshalCode(::IceUtil::Output&, const TypePtr&, const std::string&, bool, const std::string& = "", const std::string& = "", bool = true); -SLICE_API void writeGenericMarshalCode(Output&, const std::list<std::pair<TypePtr, std::string> >&, const TypePtr&); -SLICE_API void writeGenericUnmarshalCode(Output&, const std::list<std::pair<TypePtr, std::string> >&, const TypePtr&); +SLICE_API void writeGenericMarshalCode(::IceUtil::Output&, const std::list<std::pair<TypePtr, std::string> >&, + const TypePtr&); +SLICE_API void writeGenericUnmarshalCode(::IceUtil::Output&, const std::list<std::pair<TypePtr, std::string> >&, + const TypePtr&); } |