aboutsummaryrefslogtreecommitdiffstats
path: root/tests/libsample
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-09-13 13:30:30 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:18:27 -0300
commit78e516f87f62c930b552b0522c8c2a01f669a9d2 (patch)
tree2c8ad2a4d08ffa3cabc0c65b884f068345d0013f /tests/libsample
parentf4800a705caacbbdada1074d5b5bfd1abf1316c3 (diff)
Added test for implicit conversion with primitive type.
Diffstat (limited to 'tests/libsample')
-rw-r--r--tests/libsample/implicitconv.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/libsample/implicitconv.h b/tests/libsample/implicitconv.h
index b7eaf9660..a95a58130 100644
--- a/tests/libsample/implicitconv.h
+++ b/tests/libsample/implicitconv.h
@@ -24,6 +24,7 @@
#define IMPLICITCONV_H
#include "libsamplemacros.h"
+#include "null.h"
class ObjectType;
@@ -35,7 +36,8 @@ public:
CtorOne,
CtorTwo,
CtorThree,
- CtorObjectTypeReference
+ CtorObjectTypeReference,
+ CtorPrimitiveType
};
enum ICOverloadedFuncEnum {
@@ -50,6 +52,7 @@ public:
ImplicitConv(CtorEnum ctorEnum) : m_ctorEnum(ctorEnum), m_objId(-1), m_value(-1.0) {}
ImplicitConv(ObjectType&) : m_ctorEnum(CtorObjectTypeReference), m_objId(-1), m_value(-1.0) {}
ImplicitConv(double value, bool=true) : m_ctorEnum(CtorNone), m_value(value) {}
+ ImplicitConv(const Null& null) : m_ctorEnum(CtorPrimitiveType) {}
~ImplicitConv() {}
inline CtorEnum ctorEnum() { return m_ctorEnum; }
@@ -72,4 +75,3 @@ private:
};
#endif // IMPLICITCONV_H
-