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
|
--- include/xmlrpc-c/base.hpp.orig 2011-07-26 14:56:50.000000000 -0300
+++ include/xmlrpc-c/base.hpp 2011-07-27 09:46:38.000000000 -0300
@@ -226,28 +226,6 @@
-template<class InputIterator> xmlrpc_c::value_array
-arrayValueSlice(InputIterator begin,
- InputIterator end) {
-/*----------------------------------------------------------------------------
- convert C++ iterator pair to XML-RPC array
------------------------------------------------------------------------------*/
- carray ret;
- for (InputIterator p = begin; p != end; ++p) {
- ret.push_back(toValue(*p));
- }
- return xmlrpc_c::value_array(ret);
-}
-
-template<class MemberClass> inline xmlrpc_c::value_array
-arrayValueArray(const MemberClass * const in,
- size_t const size) {
-/*----------------------------------------------------------------------------
- convert C++ array to XML-RPC array
------------------------------------------------------------------------------*/
- return arrayValueSlice(in, in + size);
-}
-
class XMLRPC_DLLEXPORT value_nil : public value {
public:
value_nil();
@@ -296,7 +274,7 @@
}
inline xmlrpc_c::value_bytestring
- toValue(cbytestring const& x) {
+toValue(cbytestring const& x) {
return xmlrpc_c::value_bytestring(x);
}
@@ -324,6 +302,19 @@
return xmlrpc_c::value_struct(ret);
}
+template<class InputIterator> xmlrpc_c::value_array
+arrayValueSlice(InputIterator begin,
+ InputIterator end) {
+/*----------------------------------------------------------------------------
+ convert C++ iterator pair to XML-RPC array
+-----------------------------------------------------------------------------*/
+ carray ret;
+ for (InputIterator p = begin; p != end; ++p) {
+ ret.push_back(toValue(*p));
+ }
+ return xmlrpc_c::value_array(ret);
+}
+
template<class T> inline xmlrpc_c::value_array
toValue(std::vector<T> const& in) {
/*----------------------------------------------------------------------------
@@ -398,6 +389,15 @@
}
}
+template<class MemberClass> inline xmlrpc_c::value_array
+arrayValueArray(const MemberClass * const in,
+ size_t const size) {
+/*----------------------------------------------------------------------------
+ convert C++ array to XML-RPC array
+-----------------------------------------------------------------------------*/
+ return arrayValueSlice(in, in + size);
+}
+
class XMLRPC_DLLEXPORT fault {
/*----------------------------------------------------------------------------
This is an XML-RPC fault.
|
