summaryrefslogtreecommitdiff
path: root/cpp/include/Slice
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/Slice')
-rw-r--r--cpp/include/Slice/CPlusPlusUtil.h16
-rw-r--r--cpp/include/Slice/Checksum.h2
-rw-r--r--cpp/include/Slice/CsUtil.h4
-rw-r--r--cpp/include/Slice/JavaUtil.h18
-rw-r--r--cpp/include/Slice/Parser.h1
-rw-r--r--cpp/include/Slice/PythonUtil.h4
-rw-r--r--cpp/include/Slice/RubyUtil.h4
-rw-r--r--cpp/include/Slice/VbUtil.h4
8 files changed, 27 insertions, 26 deletions
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 2ff480c7e2d..bdf72e95e29 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -25,9 +25,9 @@ struct ToIfdef
SLICE_API std::string normalizePath(const std::string&);
SLICE_API std::string changeInclude(const std::string&, const std::vector<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 void printHeader(::IceUtilInternal::Output&);
+SLICE_API void printVersionCheck(::IceUtilInternal::Output&);
+SLICE_API void printDllExportStuff(::IceUtilInternal::Output&, const std::string&);
SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), bool = true);
SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList());
@@ -37,18 +37,18 @@ SLICE_API std::string operationModeToString(Operation::Mode);
SLICE_API std::string fixKwd(const std::string&);
-SLICE_API void writeMarshalUnmarshalCode(::IceUtil::Output&, const TypePtr&, const std::string&, bool,
+SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool,
const std::string& = "", bool = true, const StringList& = StringList(),
bool = false);
-SLICE_API void writeMarshalCode(::IceUtil::Output&, const ParamDeclList&, const TypePtr&,
+SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
const StringList&, bool = false);
-SLICE_API void writeUnmarshalCode(::IceUtil::Output&, const ParamDeclList&, const TypePtr&,
+SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
const StringList&, bool = false);
-SLICE_API void writeAllocateCode(::IceUtil::Output&, const ParamDeclList&, const TypePtr&,
+SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
const StringList&, bool = false, bool = false);
-SLICE_API void writeStreamMarshalUnmarshalCode(::IceUtil::Output&, const TypePtr&, const std::string&, bool,
+SLICE_API void writeStreamMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool,
const std::string& = "", bool = false, const StringList& = StringList());
SLICE_API std::string findMetaData(const StringList&, bool);
SLICE_API bool inWstringModule(const SequencePtr&);
diff --git a/cpp/include/Slice/Checksum.h b/cpp/include/Slice/Checksum.h
index d95e23fed86..70b1e18382e 100644
--- a/cpp/include/Slice/Checksum.h
+++ b/cpp/include/Slice/Checksum.h
@@ -11,6 +11,8 @@
#define SLICE_CHECKSUM_H
#include <Slice/Parser.h>
+#include <map>
+#include <vector>
namespace Slice
{
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index ca935b3e578..7d0b23495a1 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -41,9 +41,9 @@ protected:
//
// Generate code to marshal or unmarshal a type
//
- void writeMarshalUnmarshalCode(::IceUtil::Output&, const TypePtr&, const std::string&, bool, bool,
+ void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, bool,
bool, const std::string& = "");
- void writeSequenceMarshalUnmarshalCode(::IceUtil::Output&, const SequencePtr&, const std::string&,
+ void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&,
bool, bool);
private:
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index 75bc163a1f1..cf133f22599 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -16,7 +16,7 @@
namespace Slice
{
-class SLICE_API JavaOutput : public ::IceUtil::Output
+class SLICE_API JavaOutput : public ::IceUtilInternal::Output
{
public:
@@ -65,7 +65,7 @@ protected:
bool open(const std::string&);
void close();
- ::IceUtil::Output& output() const;
+ ::IceUtilInternal::Output& output() const;
//
// Check a symbol against any of the Java keywords. If a
@@ -120,42 +120,42 @@ protected:
//
// Generate code to marshal or unmarshal a type.
//
- void writeMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const TypePtr&, const std::string&,
+ void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, const std::string&,
bool, int&, bool = false, const StringList& = StringList(),
const std::string& patchParams = "");
//
// Generate code to marshal or unmarshal a dictionary type.
//
- void writeDictionaryMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const DictionaryPtr&,
+ void writeDictionaryMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const DictionaryPtr&,
const std::string&, bool, int&, bool,
const StringList& = StringList());
//
// Generate code to marshal or unmarshal a sequence type.
//
- void writeSequenceMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const SequencePtr&,
+ void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const SequencePtr&,
const std::string&, bool, int&, bool,
const StringList& = StringList());
//
// Generate code to marshal or unmarshal a type using the public stream API.
//
- void writeStreamMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const TypePtr&, const std::string&,
+ void writeStreamMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, const std::string&,
bool, int&, bool = false, const StringList& = StringList(),
const std::string& patchParams = "");
//
// Generate code to marshal or unmarshal a dictionary type using the public stream API.
//
- void writeStreamDictionaryMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const DictionaryPtr&,
+ void writeStreamDictionaryMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const DictionaryPtr&,
const std::string&, bool, int&, bool,
const StringList& = StringList());
//
// Generate code to marshal or unmarshal a sequence type using the public stream API.
//
- void writeStreamSequenceMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const SequencePtr&,
+ void writeStreamSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const SequencePtr&,
const std::string&, bool, int&, bool,
const StringList& = StringList());
@@ -221,7 +221,7 @@ private:
friend class JavaGenerator::MetaDataVisitor;
std::string _dir;
- ::IceUtil::Output* _out;
+ ::IceUtilInternal::Output* _out;
};
}
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 8608af9b070..72a528473ac 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -12,7 +12,6 @@
#include <IceUtil/Shared.h>
#include <IceUtil/Handle.h>
-#include <IceUtil/InputUtil.h>
#include <string>
#include <vector>
#include <list>
diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h
index 4440fb982e6..40ef68d433f 100644
--- a/cpp/include/Slice/PythonUtil.h
+++ b/cpp/include/Slice/PythonUtil.h
@@ -21,7 +21,7 @@ namespace Python
//
// Generate Python code for a translation unit.
//
-SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtil::Output&);
+SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&);
//
// Convert a scoped name into a Python name.
@@ -54,7 +54,7 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, const std::string&
//
// Emit a comment header.
//
-SLICE_API void printHeader(IceUtil::Output&);
+SLICE_API void printHeader(IceUtilInternal::Output&);
}
}
diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h
index c581c66e2e5..c3d6e1446b7 100644
--- a/cpp/include/Slice/RubyUtil.h
+++ b/cpp/include/Slice/RubyUtil.h
@@ -21,7 +21,7 @@ namespace Ruby
//
// Generate Ruby code for a translation unit.
//
-SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtil::Output&);
+SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&);
//
// Check the given identifier against Ruby's list of reserved words. If it matches
@@ -44,7 +44,7 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const
//
// Emit a comment header.
//
-SLICE_API void printHeader(IceUtil::Output&);
+SLICE_API void printHeader(IceUtilInternal::Output&);
}
}
diff --git a/cpp/include/Slice/VbUtil.h b/cpp/include/Slice/VbUtil.h
index 62939d78b23..3e1f477994e 100644
--- a/cpp/include/Slice/VbUtil.h
+++ b/cpp/include/Slice/VbUtil.h
@@ -39,9 +39,9 @@ protected:
//
// Generate code to marshal or unmarshal a type
//
- void writeMarshalUnmarshalCode(::IceUtil::Output&, const TypePtr&, const std::string&, bool, bool,
+ void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, bool,
bool, const std::string& = "");
- void writeSequenceMarshalUnmarshalCode(::IceUtil::Output&, const SequencePtr&, const std::string&, bool, bool);
+ void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&, bool, bool);
private:
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:58:51 +0000