fix build failure related implicit typecasting with X86 in bridging.

[Error Message]
bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp:219:9: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'std::vector<std::shared_ptr<LifxLight> >::size_type {aka unsigned int}' [-Werror=format]
bridging/plugins/hue_plugin/hue_resource.cpp: In function 'OCEntityHandlerResult processGetRequest(OCRepPayload*, HueLightSharedPtr, std::string)':
bridging/plugins/hue_plugin/hue_resource.cpp:842:9: error: format '%d' expects argument of type 'int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Werror=format]
bridging/plugins/hue_plugin/hue_resource.cpp:842:9: error: format '%d' expects argument of type 'int', but argument 5 has type 'uint64_t {aka long long unsigned int}' [-Werror=format]
bridging/plugins/hue_plugin/hue_resource.cpp: In function 'OCEntityHandlerResult processPutRequest(OCEntityHandlerRequest*, HueLightSharedPtr, std::string, OCRepPayload*)':
bridging/plugins/hue_plugin/hue_resource.cpp:897:9: error: format '%d' expects argument of type 'int', but argument 4 has type 'int64_t {aka long long int}' [-Werror=format]
bridging/plugins/hue_plugin/hue_resource.cpp:932:13: error: format '%d' expects argument of type 'int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Werror=format]
bridging/plugins/hue_plugin/hue_resource.cpp:943:13: error: format '%d' expects argument of type 'int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Werror=format]

Change-Id: I39977d75810b4eb9b4bc0fc008825330fd12c0af
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17725
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>

diff --git a/bridging/plugins/hue_plugin/hue_resource.cpp b/bridging/plugins/hue_plugin/hue_resource.cpp
index 6dd8cfd..9346299 100644 (file)
--- a/bridging/plugins/hue_plugin/hue_resource.cpp
+++ b/bridging/plugins/hue_plugin/hue_resource.cpp
@@ -35,6 +35,7 @@
 #include <algorithm>
 #include <stdlib.h>
 #include <stdio.h>
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <string.h>
 #include <string>
@@ -824,8 +825,8 @@ OCEntityHandlerResult processGetRequest(OCRepPayload *payload, HueLightSharedPtr
         {
             throw "Failed to set 'brightness' in payload";
         }
-        OIC_LOG_V(INFO, TAG, " Brightness State (Hue Bulb): %ld  Brightness(OCF) : %d",
-                              light_state.bri, ocfBrightness);
+        OIC_LOG_V(INFO, TAG, " Brightness State (Hue Bulb): %" PRIu64 " Brightness(OCF) : %d",
+                  light_state.bri, ocfBrightness);
     }
     else if (HUE_CHROMA_RESOURCE_TYPE == resType)
     {
@@ -839,7 +840,7 @@ OCEntityHandlerResult processGetRequest(OCRepPayload *payload, HueLightSharedPtr
         {
             throw  "Failed to set csc in payload" ;
         }
-        OIC_LOG_V(INFO, TAG, "hue: %ld, sat: %ld, csc: [%f, %f] in payload.",
+        OIC_LOG_V(INFO, TAG, "hue: %" PRIu64 ", sat: %" PRIu64 ", csc: [%f, %f] in payload.",
                   light_state.hue,
                   light_state.sat,
                   light_state.csc[0],
@@ -894,7 +895,7 @@ OCEntityHandlerResult processPutRequest(OCEntityHandlerRequest *ehRequest,
         {
             throw "No brightness in representation" ;
         }
-        OIC_LOG_V(INFO, TAG, "PUT/POST brightness:%ld", light_resource.bri);
+        OIC_LOG_V(INFO, TAG, "PUT/POST brightness:%" PRIu64 "", light_resource.bri);
 
         // Sclae up from 1-100 for OCF Light to 1-254 for Hue device
         light_resource.bri *= 2.54;
@@ -928,7 +929,7 @@ OCEntityHandlerResult processPutRequest(OCEntityHandlerRequest *ehRequest,
         {
             state.hue = light_resource.hue;
             isChromaPropertyInPayload = true;
-            OIC_LOG_V(INFO, TAG, "PUT/POST hue :%ld", state.hue);
+            OIC_LOG_V(INFO, TAG, "PUT/POST hue :%" PRIu64 "", state.hue);
         }
 
         if (!OCRepPayloadGetPropInt(input, "saturation", &light_resource.sat))
@@ -939,7 +940,7 @@ OCEntityHandlerResult processPutRequest(OCEntityHandlerRequest *ehRequest,
         {
             state.sat = light_resource.sat;
             isChromaPropertyInPayload = true;
-            OIC_LOG_V(INFO, TAG, "PUT/POST sat :%ld", state.sat);
+            OIC_LOG_V(INFO, TAG, "PUT/POST sat :%" PRIu64 "", state.sat);
         }
 
         if (!OCRepPayloadSetPropInt(payload, "hue", state.hue) ||

diff --git a/bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp b/bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp
index 19babc7..13d89aa 100644 (file)
--- a/bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp
+++ b/bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp
@@ -19,6 +19,8 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 //
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include "stringbuffer.h"
 #include "writer.h"
 #include "curlClient.h"
@@ -216,7 +218,7 @@ MPMResult LifxLight::refreshState()
 
     if (parsedLights.size() != 1)
     {
-        OIC_LOG_V(ERROR, TAG, "This is irregular! Instead of 1 light, returned %ld " , parsedLights.size());
+        OIC_LOG_V(ERROR, TAG, "This is irregular! Instead of 1 light, returned %" PRIuPTR "", parsedLights.size());
         return MPM_RESULT_JSON_ERROR;
     }