diff options
author | JackLivio <jack@livio.io> | 2018-10-19 15:05:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-19 15:05:09 -0400 |
commit | d36316738785c96dab2ee892762ed08c059fffde (patch) | |
tree | 168a7c0705b5bc8f0dee7ce4b511ccf71759d9b4 /src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h | |
parent | 7f7fcbb998fb17f2954fd103349af67ea9b71a3f (diff) | |
parent | 83c5e805346d55ec7fb9f4ba8b6f6855d992273e (diff) | |
download | sdl_core-hotfix/templates_updates.tar.gz |
Merge pull request #2572 from smartdevicelink/release/5.0.05.0.0hotfix/templates_updatesfeature/show_app_menufeature/progress_bar_seekfeature/open-menu-rpcfeature/open-menu-rfeature/button
Release 5.0.0
Diffstat (limited to 'src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h')
-rw-r--r-- | src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h index 618901ffa8..ff7b9da9d6 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h @@ -46,11 +46,6 @@ #include "protocol_handler_observer.h" #include "protocol_handler/protocol_handler_impl.h" -namespace utils { -template <typename T> -class SharedPtr; -} - namespace telemetry_monitor { using ::utils::MessageQueue; @@ -62,7 +57,7 @@ class Streamer : public threads::ThreadDelegate { void threadMain() OVERRIDE; void exitThreadMain() OVERRIDE; - virtual void PushMessage(utils::SharedPtr<MetricWrapper> metric); + virtual void PushMessage(std::shared_ptr<MetricWrapper> metric); volatile bool is_client_connected_; private: @@ -75,7 +70,7 @@ class Streamer : public threads::ThreadDelegate { int32_t server_socket_fd_; int32_t client_socket_fd_; volatile bool stop_flag_; - MessageQueue<utils::SharedPtr<MetricWrapper> > messages_; + MessageQueue<std::shared_ptr<MetricWrapper> > messages_; DISALLOW_COPY_AND_ASSIGN(Streamer); }; @@ -91,9 +86,8 @@ class TelemetryMonitor { transport_manager); virtual void Stop(); virtual void Start(); - virtual void SendMetric(utils::SharedPtr<MetricWrapper> metric); - DEPRECATED void set_streamer(Streamer* streamer); - void set_streamer(utils::SharedPtr<Streamer> streamer); + virtual void SendMetric(std::shared_ptr<MetricWrapper> metric); + void set_streamer(std::shared_ptr<Streamer> streamer); const std::string& ip() const; int16_t port() const; @@ -101,7 +95,7 @@ class TelemetryMonitor { std::string server_address_; int16_t port_; threads::Thread* thread_; - utils::SharedPtr<Streamer> streamer_; + std::shared_ptr<Streamer> streamer_; ApplicationManagerObserver app_observer; TransportManagerObserver tm_observer; ProtocolHandlerObserver ph_observer; |