summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-12-04 23:25:34 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:49 +0100
commit828ae52362d1d12240fe4150d4ec70fd1652bfd4 (patch)
treedd31252d196ad3c7b0d3427498e910793508dc4d
parentc2d3a33fdb8243ecb6c973c29ea2b834a33e330f (diff)
Avoid warning about deleting void* variable
And replace free calls by delete because operator new was used. Change-Id: Ifb0d301b0a09dd83e3ad574c97e02bd8af072ae6 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--signal-composer-binding/signal-composer.cpp2
-rw-r--r--signal-composer-binding/signal.cpp2
-rw-r--r--signal-composer-binding/source.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp
index d9d004c..903af9c 100644
--- a/signal-composer-binding/signal-composer.cpp
+++ b/signal-composer-binding/signal-composer.cpp
@@ -575,7 +575,7 @@ void* Composer::createContext(void* ctx)
void Composer::destroyContext(void* ctx)
{
- free(ctx);
+ delete(ctx);
}
std::vector<std::string> Composer::parseURI(const std::string& uri)
diff --git a/signal-composer-binding/signal.cpp b/signal-composer-binding/signal.cpp
index 17286f5..ab8723e 100644
--- a/signal-composer-binding/signal.cpp
+++ b/signal-composer-binding/signal.cpp
@@ -72,7 +72,7 @@ Signal::Signal(const std::string& id,
Signal::~Signal()
{
- free(onReceived_);
+ delete(onReceived_);
}
Signal::operator bool() const
diff --git a/signal-composer-binding/source.cpp b/signal-composer-binding/source.cpp
index 830f799..6ad9511 100644
--- a/signal-composer-binding/source.cpp
+++ b/signal-composer-binding/source.cpp
@@ -117,7 +117,7 @@ void SourceAPI::makeSubscription()
ActionExecOne(&source, getSignals_, signalJ);
// Considerate signal subscribed no matter what
sig.second->subscribed_ = true;
- delete(source.context);
+ delete((struct signalCBT*)source.context);
}
source.uid = "";
ActionExecOne(&source, getSignals_, nullptr);