[IOT-1363] Fix from C++ changes
authorabitha.s <abitha.s@samsung.com>
Tue, 27 Sep 2016 13:32:01 +0000 (19:02 +0530)
committerUze Choi <uzchoi@samsung.com>
Thu, 29 Sep 2016 08:02:00 +0000 (08:02 +0000)
commit5e4079c850b79fa2e39301df561c2ec1063d0308
tree115bb96731dcba5c6d0e68c0311067fe307a3287
parentcbf966cc737b79530cac8cf8920412ec3d36bde9
[IOT-1363] Fix from C++ changes

patch 2 : resolved merge conflict

Change-Id: I535084c3e1c9fcf302038ccbf98aaff02cd97167
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
service/notification/cpp-wrapper/common/NSMessage.cpp
service/notification/cpp-wrapper/provider/src/NSProviderService.cpp