projects
/
platform
/
core
/
system
/
sensord.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc9df4b
)
Bug Fixing - Corrected the return value for operator '+' for sensor_data
30/33830/1
author
Ankur
<ankur29.garg@samsung.com>
Thu, 15 Jan 2015 11:45:58 +0000
(17:15 +0530)
committer
Ankur
<ankur29.garg@samsung.com>
Thu, 15 Jan 2015 11:46:05 +0000
(17:16 +0530)
Change-Id: Ie59aeab94e276de203697dceb07fa59da15185f3
src/sensor_fusion/sensor_data.cpp
patch
|
blob
|
history
diff --git
a/src/sensor_fusion/sensor_data.cpp
b/src/sensor_fusion/sensor_data.cpp
index
677544f
..
4794b5e
100644
(file)
--- a/
src/sensor_fusion/sensor_data.cpp
+++ b/
src/sensor_fusion/sensor_data.cpp
@@
-71,7
+71,8
@@
sensor_data<TYPE> sensor_data<TYPE>::operator =(const sensor_data<TYPE>& s)
template <typename T>
sensor_data<T> operator +(sensor_data<T> data1, sensor_data<T> data2)
{
- return (data1.m_data + data2.m_data);
+ sensor_data<T> result(data1.m_data + data2.m_data, data1.m_time_stamp);
+ return result;
}
template <typename T>