summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangjung Woo <sangjung.woo@samsung.com>2016-11-02 21:40:52 +0900
committerKevron Rees <tripzero.kev@gmail.com>2016-11-03 10:33:47 -0700
commitbe3f71efda71a23251324877e13cc8dec0f5b1f3 (patch)
tree97868cb27068c11e743dda1ee77134f7ba2e38c1
parentd5c2a05eed5f9d4523b5007f3b6edabb664b0649 (diff)
downloadautomotive-message-broker-be3f71efda71a23251324877e13cc8dec0f5b1f3.tar.gz
AmbSignalMapper: clean up the warning message
Some generated functions by AmbSignalMapper do not return the result even it is not a void function. Because of this reason, below error occurs when build it. This patch fixes this bug. --------------------------------------------------------------------- warning: control reaches end of non-void function [-Wreturn-type] --------------------------------------------------------------------- Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com>
-rw-r--r--tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.cpp2
-rw-r--r--tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.cpp b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.cpp
index cd4b6d34..aa213da2 100644
--- a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.cpp
+++ b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.cpp
@@ -125,6 +125,8 @@ bool CANSignal::updateFrame(can_frame* frame)
int64_t bits = conversionFunctionTo(val, static_cast<int64_t>(temp));
*(reinterpret_cast<uint64_t*>(&frame->data[0])) |= toSignalBits(bits);
+
+ return true;
}
int64_t CANSignal::getSignalBits( const can_frame& frame )
diff --git a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.h b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.h
index 1201c3fb..a73c44ac 100644
--- a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.h
+++ b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/ambtmpl_cansignal.h
@@ -242,7 +242,7 @@ private:
} \
uint64_t conversionFunctionTo(double value, uint64_t bits) { \
if(convertToFunction) \
- convertToFunction(convert<valueType>(value), bits); \
+ return convertToFunction(convert<valueType>(value), bits); \
else return bits; \
} \
valueType m_minValue; \