Merge remote-tracking branch 'upstream/incoming' into fast-cwrap

1 files changed, 3 insertions, 0 deletions

diff --git a/tests/webidl/test.h b/tests/webidl/test.h
index 903f8f78..5d13846c 100644
--- a/tests/webidl/test.h
+++ b/tests/webidl/test.h
@@ -10,6 +10,8 @@ public:
   Parent(Parent *p, Parent *q); // overload constructor
   int getVal() { return value; }; // inline should work just fine here, unlike Way 1 before
   void mulVal(int mul);
+  void parentFunc() {}
+  const Parent *getAsConst() { return NULL; }
 };
 
 class Child1 : public Parent {
@@ -19,6 +21,7 @@ public:
   int getValSqr() { return value*value; }
   int getValSqr(int more) { return value*value*more; }
   int getValTimes(int times=1) { return value*times; }
+  void parentFunc(int x) { printf("Child1::parentFunc(%d)\n", x); }
 };
 
 // Child2 has vtable, parent does not. Checks we cast child->parent properly - (Parent*)child is not a no-op, must offset