Loosen tuple type checking between numeric types

Change-Id: I98425ba02f510104a27ad1e62b08ea2917742290
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/src/shared/Tuple.cpp b/src/shared/Tuple.cpp
index e668ff3..101c644 100644 (file)
--- a/src/shared/Tuple.cpp
+++ b/src/shared/Tuple.cpp
@@ -84,15 +84,27 @@ unsigned int Tuple::size()
 
 bool Tuple::getAt(unsigned int idx, int64_t* val)
 {
-       IF_FAIL_RETURN(__verify(idx, G_VARIANT_TYPE_INT64), false);
-       *val = g_variant_get_int64(__elements[idx]);
+       if (__verify(idx, G_VARIANT_TYPE_INT64)) {
+               *val = g_variant_get_int64(__elements[idx]);
+       } else if (__verify(idx, G_VARIANT_TYPE_DOUBLE)) {
+               *val = g_variant_get_double(__elements[idx]);
+       } else {
+               return false;
+       }
+
        return true;
 }
 
 bool Tuple::getAt(unsigned int idx, double* val)
 {
-       IF_FAIL_RETURN(__verify(idx, G_VARIANT_TYPE_DOUBLE), false);
-       *val = g_variant_get_double(__elements[idx]);
+       if (__verify(idx, G_VARIANT_TYPE_DOUBLE)) {
+               *val = g_variant_get_double(__elements[idx]);
+       } else if (__verify(idx, G_VARIANT_TYPE_INT64)) {
+               *val = g_variant_get_int64(__elements[idx]);
+       } else {
+               return false;
+       }
+
        return true;
 }