Enable Build with GCC 9.2

Change-Id: I783b315f0208221b668f6168a23257673a396966
Signed-off-by: Abhimanyu Swami <abhimanyu1.s@samsung.com>

diff --git a/src/api/maps_address.cpp b/src/api/maps_address.cpp
index 47e79382abcbb3333913fd286ff9dba66b7ced6e..400bcfe00c4c5164adac77ac3822f470e308c468 100644 (file)
--- a/src/api/maps_address.cpp
+++ b/src/api/maps_address.cpp
@@ -528,7 +528,7 @@ EXPORT_API int maps_address_list_destroy(maps_address_list_h address_list)
 bool maps_address_is_valid(const maps_address_h address)
 {
        if (!maps_condition_check_maps_feature())
-               return MAPS_ERROR_NOT_SUPPORTED;
+               return false;
        if (!address) return false;
 
        bool ret = false;

diff --git a/src/api/maps_area.cpp b/src/api/maps_area.cpp
index 01967d0b656a8d74004d7ae7f4e6b23b2ac9703f..98df919b7b578dd84796a755415126ec72eac29a 100644 (file)
--- a/src/api/maps_area.cpp
+++ b/src/api/maps_area.cpp
@@ -135,7 +135,7 @@ EXPORT_API int maps_area_clone(const maps_area_h origin, maps_area_h *cloned)
 bool maps_area_is_valid(const maps_area_h area)
 {
        if (!maps_condition_check_maps_feature())
-               return MAPS_ERROR_NOT_SUPPORTED;
+               return false;
        if (!area) return false;
 
        bool ret = true;

diff --git a/src/api/maps_coordinates.cpp b/src/api/maps_coordinates.cpp
index 18d147e86894f505ca65e9ff23eec7c0f25859f2..c5a8bf52a968d8271717455c1a1e797c8fe228a1 100644 (file)
--- a/src/api/maps_coordinates.cpp
+++ b/src/api/maps_coordinates.cpp
@@ -280,15 +280,26 @@ EXPORT_API int maps_coordinates_list_foreach(maps_coordinates_list_h coordinates
 
 bool maps_coordinates_is_valid(const maps_coordinates_h coordinates)
 {
-       if (!coordinates)
-               return false;
+       bool ret_val = true;
 
-       maps_coordinates_s *coord = (maps_coordinates_s *)coordinates;
+        if (!coordinates)
+                return false;
 
-       MAPS_CHECK_CONDITION(coord->latitude >= -90 && coord->latitude <= 90, MAPS_ERROR_INVALID_PARAMETER,
-               "MAPS_ERROR_INVALID_PARAMETER");
-       MAPS_CHECK_CONDITION(coord->longitude >= -180 && coord->longitude <= 180, MAPS_ERROR_INVALID_PARAMETER,
-               "MAPS_ERROR_INVALID_PARAMETER");
+        maps_coordinates_s *coord = (maps_coordinates_s *)coordinates;
+
+        if (!(coord->latitude >= -90 && coord->latitude <= 90)) {
+                MAPS_LOGE("%s(0x%08x)", "MAPS_ERROR_INVALID_PARAMETER", MAPS_ERROR_INVALID_PARAMETER);
+                ret_val = false;
+                goto END;
+        }
+
+        if (!(coord->longitude >= -180 && coord->longitude <= 180)) {
+                MAPS_LOGE("%s(0x%08x)", "MAPS_ERROR_INVALID_PARAMETER", MAPS_ERROR_INVALID_PARAMETER);
+                ret_val = false;
+                goto END;
+        }
+
+END:
+        return ret_val;
 
-       return true;
 }

diff --git a/src/maps_util.h b/src/maps_util.h
index f156406b784600a4accaeb41a517aba1427c8c8c..ee1f636df96ac36600253e87d5a1763a49ca247f 100755 (executable)
--- a/src/maps_util.h
+++ b/src/maps_util.h
@@ -54,7 +54,7 @@
                if (condition) { \
                } else { \
                        MAPS_LOGE("%s(0x%08x)", msg, error); \
-                       return error; \
+                       return error;\
                } \
        } while (0)