Merge branch 'develop' into feature/android

* develop: fix(win): complie error. feat(imu intri/extri): add service data
2019-02-12 16:12:55 +08:00
parent 4b8b7f707c 13bdcf24bd
commit c5bf93dfbd
2 changed files with 40 additions and 9 deletions
--- a/src/mynteye/api/synthetic.h
+++ b/src/mynteye/api/synthetic.h
@@ -146,7 +146,7 @@ class SyntheticProcessorPart {
  inline std::vector<Synthetic::stream_control_t> getTargetStreams() {
    return target_streams_;
  }
-  inline Stream addTargetStreams(const Synthetic::stream_control_t& strm) {
+  inline void addTargetStreams(const Synthetic::stream_control_t& strm) {
    target_streams_.push_back(strm);
  }