6248f9a029
This brings IoTivoity to version 1.1.0 The old @lantiq.com address does not work any more, update to the @intel.com address. The removed patches were merged upstream, but there are still some new ones needed. Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From e093390b2839f6039a6ff94ed4942fa45c53a418 Mon Sep 17 00:00:00 2001
|
|
From: Philippe Coval <philippe.coval@osg.samsung.com>
|
|
Date: Tue, 26 Apr 2016 15:28:17 +0200
|
|
Subject: [PATCH] [Resource-container] Backported init fix to 1.1-rel
|
|
|
|
[Resource-container] Fix member var initialization
|
|
|
|
Incorrect type was used causing build error.
|
|
|
|
Origin: 6a10062f1fe64ca75ac6d34541bbd295ef052dcb
|
|
Author: Inga Stotland <inga.stotland@intel.com>
|
|
Change-Id: I701096c3b6512546847cf4e120430f690e920453
|
|
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
|
|
Reviewed-on: https://gerrit.iotivity.org/gerrit/7759
|
|
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
|
|
Reviewed-by: George Nash <george.nash@intel.com>
|
|
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
|
|
Reviewed-by: Uze Choi <uzchoi@samsung.com>
|
|
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
|
|
Reviewed-on: https://gerrit.iotivity.org/gerrit/7929
|
|
---
|
|
service/resource-container/src/BundleInfoInternal.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/service/resource-container/src/BundleInfoInternal.cpp
|
|
+++ b/service/resource-container/src/BundleInfoInternal.cpp
|
|
@@ -32,8 +32,8 @@ namespace OIC
|
|
m_resourceCreator = nullptr;
|
|
m_resourceDestroyer = nullptr;
|
|
m_bundleHandle = nullptr;
|
|
- m_so_bundle = nullptr;
|
|
|
|
+ m_so_bundle = false;
|
|
m_loaded = false;
|
|
m_activated = false;
|
|
m_java_bundle = false;
|