1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
--- python/modules/IcePy/Types.cpp.orig 2015-01-18 15:25:00.277654935 +0100
+++ python/modules/IcePy/Types.cpp 2015-01-18 15:24:52.737609935 +0100
@@ -915,7 +915,7 @@
}
void
-IcePy::PrimitiveInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*)
+IcePy::PrimitiveInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory*)
{
if(!validate(value))
{
@@ -1050,7 +1050,7 @@
}
void
-IcePy::EnumInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*)
+IcePy::EnumInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory*)
{
if(!validate(value))
{
@@ -1305,7 +1311,7 @@
}
void
-IcePy::StructInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::StructInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(!validate(value))
{
@@ -1559,7 +1571,7 @@
}
void
-IcePy::SequenceInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::SequenceInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(!validate(value))
{
@@ -2397,7 +2409,7 @@
}
void
-IcePy::CustomInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::CustomInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(!validate(value))
{
@@ -2597,7 +2615,7 @@
}
void
-IcePy::DictionaryInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::DictionaryInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(!validate(value))
{
@@ -2798,7 +2816,7 @@
}
void
-IcePy::ClassInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::ClassInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(!validate(value))
{
@@ -2863,7 +2881,7 @@
}
void
-IcePy::ClassInfo::printMembers(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::ClassInfo::printMembers(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(base)
{
@@ -3011,7 +3035,7 @@
}
void
-IcePy::ProxyInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*)
+IcePy::ProxyInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory*)
{
if(!validate(value))
{
@@ -3463,7 +3487,7 @@
}
void
-IcePy::ExceptionInfo::print(PyObject* value, IceUtilInternal::Output& out)
+IcePy::ExceptionInfo::print(PyObject* value, PrintHelper& out)
{
if(!PyObject_IsInstance(value, pythonType.get()))
{
@@ -3481,7 +3505,7 @@
}
void
-IcePy::ExceptionInfo::printMembers(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::ExceptionInfo::printMembers(PyObject* value, PrintHelper& out, PrintObjectHistory* history)
{
if(base)
{
@@ -4209,7 +4233,7 @@
assert(info);
ostringstream ostr;
- IceUtilInternal::Output out(ostr);
+ PrintHelper out(ostr);
PrintObjectHistory history;
history.index = 0;
info->print(value, out, &history);
@@ -4234,7 +4258,7 @@
assert(info);
ostringstream ostr;
- IceUtilInternal::Output out(ostr);
+ PrintHelper out(ostr);
info->print(value, out);
string str = ostr.str();
|
