Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added const versions of XmlRpcValue converting operators. #1978

Merged
merged 1 commit into from
Jun 24, 2020
Merged

Added const versions of XmlRpcValue converting operators. #1978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ namespace XmlRpc {
operator BinaryData&() { assertTypeOrInvalid(TypeBase64); return *_value.asBinary; }
operator struct tm&() { assertTypeOrInvalid(TypeDateTime); return *_value.asTime; }

operator const bool&() const { assertTypeOrInvalid(TypeBoolean); return _value.asBool; }
operator const int&() const { assertTypeOrInvalid(TypeInt); return _value.asInt; }
operator const double&() const { assertTypeOrInvalid(TypeDouble); return _value.asDouble; }
operator const std::string&() const { assertTypeOrInvalid(TypeString); return *_value.asString; }
operator const BinaryData&() const { assertTypeOrInvalid(TypeBase64); return *_value.asBinary; }
operator const struct tm&() const { assertTypeOrInvalid(TypeDateTime); return *_value.asTime; }

XmlRpcValue const& operator[](int i) const { assertArray(i+1); return _value.asArray->at(i); }
XmlRpcValue& operator[](int i) { assertArray(i+1); return _value.asArray->at(i); }

Expand Down Expand Up @@ -147,6 +154,7 @@ namespace XmlRpc {
void invalidate();

// Type checking
void assertTypeOrInvalid(Type t) const;
void assertTypeOrInvalid(Type t);
void assertArray(int size) const;
void assertArray(int size);
Expand Down
6 changes: 6 additions & 0 deletions utilities/xmlrpcpp/src/XmlRpcValue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ namespace XmlRpc {


// Type checking
void XmlRpcValue::assertTypeOrInvalid(Type t) const
{
if (_type != t)
throw XmlRpcException("type error");
}

void XmlRpcValue::assertTypeOrInvalid(Type t)
{
if (_type == TypeInvalid)
Expand Down
16 changes: 8 additions & 8 deletions utilities/xmlrpcpp/test/TestValues.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEST(XmlRpc, Bool) {
}

TEST(XmlRpc, testBoolean) {
XmlRpcValue booleanFalse(false);
const XmlRpcValue booleanFalse(false);
XmlRpcValue booleanTrue(true);
int offset = 0;
XmlRpcValue booleanFalseXml("<value><boolean>0</boolean></value>", &offset);
Expand All @@ -75,7 +75,7 @@ TEST(XmlRpc, testBoolean) {

// Int
TEST(XmlRpc, testInt) {
XmlRpcValue int0(0);
const XmlRpcValue int0(0);
ASSERT_EQ(XmlRpcValue::TypeInt, int0.getType());

XmlRpcValue int1(1);
Expand Down Expand Up @@ -110,7 +110,7 @@ TEST(XmlRpc, testInt) {

TEST(XmlRpc, testDouble) {
// Double
XmlRpcValue d(43.7);
const XmlRpcValue d(43.7);
ASSERT_EQ(XmlRpcValue::TypeDouble, d.getType());
EXPECT_EQ("<value><double>43.700000000000003</double></value>", d.toXml());
EXPECT_DOUBLE_EQ(43.7, double(d));
Expand All @@ -130,7 +130,7 @@ TEST(XmlRpc, testDouble) {

TEST(XmlRpc, testString) {
// String
XmlRpcValue s("Now is the time <&");
const XmlRpcValue s("Now is the time <&");
ASSERT_EQ(XmlRpcValue::TypeString, s.getType());
EXPECT_EQ(18, s.size());
EXPECT_EQ("<value>Now is the time &lt;&amp;</value>", s.toXml());
Expand Down Expand Up @@ -178,7 +178,7 @@ TEST(XmlRpc, testDateTime) {
// DateTime
int offset = 0;
// Construct from XML
XmlRpcValue dateTime(
const XmlRpcValue dateTime(
"<value><dateTime.iso8601>19040503T03:12:35</dateTime.iso8601></value>",
&offset);
ASSERT_EQ(XmlRpcValue::TypeDateTime, dateTime.getType());
Expand Down Expand Up @@ -286,7 +286,7 @@ TEST(XmlRpc, testArray) {
EXPECT_EQ(a, aXml);

// Array copy works
XmlRpcValue copy(a);
const XmlRpcValue copy(a);
ASSERT_EQ(a.getType(), copy.getType());
ASSERT_EQ(a.size(), copy.size());
for (int i = 0; i < 3; i++) {
Expand Down Expand Up @@ -345,7 +345,7 @@ TEST(XmlRpc, testStruct) {
"</struct></value>";

int offset = 0;
XmlRpcValue structXml(csStructXml, &offset);
const XmlRpcValue structXml(csStructXml, &offset);
EXPECT_EQ(struct1, structXml);

for (XmlRpcValue::iterator itr = struct1.begin(); itr != struct1.end();
Expand Down Expand Up @@ -399,7 +399,7 @@ TEST(XmlRpc, testStruct) {

TEST(XmlRpc, base64) {
char data[] = {1, 2};
XmlRpcValue bin(data, 2);
const XmlRpcValue bin(data, 2);

EXPECT_EQ(XmlRpcValue::TypeBase64, bin.getType());
EXPECT_EQ(2, bin.size());
Expand Down