summaryrefslogtreecommitdiffstats
path: root/testfiles/src/object-set-test.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-10-25 21:31:28 +0000
committerjabiertxof <info@marker.es>2016-10-25 21:31:28 +0000
commit47afab8f225cffbcc94d49216c4382410a84ed47 (patch)
tree3e639a4b359de538b5bf037eb3e43d85f7b2673c /testfiles/src/object-set-test.cpp
parentSome bug fixes and improvements (diff)
parentFix signals (diff)
downloadinkscape-47afab8f225cffbcc94d49216c4382410a84ed47.tar.gz
inkscape-47afab8f225cffbcc94d49216c4382410a84ed47.zip
Update to trunk
(bzr r15142.1.26)
Diffstat (limited to 'testfiles/src/object-set-test.cpp')
-rw-r--r--testfiles/src/object-set-test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/testfiles/src/object-set-test.cpp b/testfiles/src/object-set-test.cpp
index 79a49488a..83c1e4ff2 100644
--- a/testfiles/src/object-set-test.cpp
+++ b/testfiles/src/object-set-test.cpp
@@ -98,7 +98,7 @@ TEST_F(ObjectSetTest, Basics) {
EXPECT_FALSE(set->includes(A));
set->clear();
EXPECT_EQ(0, set->size());
- bool resultNull = set->add(nullptr);
+ bool resultNull = set->add((SPObject*)nullptr);
EXPECT_FALSE(resultNull);
EXPECT_EQ(0, set->size());
bool resultNull2 = set->remove(nullptr);