diff options
| author | Sho Amano <samano@xevo.com> | 2018-06-25 13:33:14 +0900 |
|---|---|---|
| committer | Sho Amano <samano@xevo.com> | 2018-06-25 13:33:14 +0900 |
| commit | e2ece1605c881da6832614a577a11b2fb1891198 (patch) | |
| tree | 0f6bfbf969927e0f7492bb7ac74d8a69c760c8c4 /src/components | |
| parent | 88a94b2df4cc9eb527b579d2f37c7a90317570bb (diff) | |
| download | sdl_core-e2ece1605c881da6832614a577a11b2fb1891198.tar.gz | |
Another revert of "fix build problems from merges"
This reverts a workaround in
commit 9b7658d79d041428d502b3d99791263473c51b73 which
was for build failures on 32-bit machine because of
ConnectionHandler::GetDataOnSessionKey().
The build failure has been fixed with latest develop
branch.
Diffstat (limited to 'src/components')
4 files changed, 0 insertions, 8 deletions
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index 6df891421d..b53d55b391 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -522,7 +522,6 @@ class ConnectionHandlerImpl std::list<int32_t>* sessions_list, connection_handler::DeviceHandle* device_id) const OVERRIDE; -#if __SIZEOF_SIZE_T__ != 4 /** * DEPRECATED * \brief information about given Connection Key. @@ -536,7 +535,6 @@ class ConnectionHandlerImpl uint32_t* app_id, std::list<int32_t>* sessions_list, uint32_t* device_id) const OVERRIDE; -#endif const ConnectionHandlerSettings& get_settings() const OVERRIDE; diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index 660dc723b9..dd2c2d29f9 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -986,7 +986,6 @@ int32_t ConnectionHandlerImpl::GetDataOnSessionKey( return 0; } -#if __SIZEOF_SIZE_T__ != 4 int32_t ConnectionHandlerImpl::GetDataOnSessionKey( uint32_t key, uint32_t* app_id, @@ -998,7 +997,6 @@ int32_t ConnectionHandlerImpl::GetDataOnSessionKey( *device_id = static_cast<uint32_t>(handle); return result; } -#endif const ConnectionHandlerSettings& ConnectionHandlerImpl::get_settings() const { return settings_; diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h index ef806530a5..357ac8c606 100644 --- a/src/components/include/connection_handler/connection_handler.h +++ b/src/components/include/connection_handler/connection_handler.h @@ -191,7 +191,6 @@ class ConnectionHandler { std::list<int32_t>* sessions_list, connection_handler::DeviceHandle* device_id) const = 0; -#if __SIZEOF_SIZE_T__ != 4 /** * DEPRECATED * \brief information about given Connection Key. @@ -206,7 +205,6 @@ class ConnectionHandler { uint32_t* app_id, std::list<int32_t>* sessions_list, uint32_t* device_id) const = 0; -#endif /** * @brief GetConnectedDevicesMAC allows to obtain MAC adresses for all diff --git a/src/components/include/protocol_handler/session_observer.h b/src/components/include/protocol_handler/session_observer.h index 7c8d3a63bb..20c552e19f 100644 --- a/src/components/include/protocol_handler/session_observer.h +++ b/src/components/include/protocol_handler/session_observer.h @@ -278,7 +278,6 @@ class SessionObserver { transport_manager::ConnectionUID* connection_handle, uint8_t* sessionId) const = 0; -#if __SIZEOF_SIZE_T__ != 4 /** * DEPRECATED * \brief information about given Connection Key. @@ -292,7 +291,6 @@ class SessionObserver { uint32_t* app_id, std::list<int32_t>* sessions_list, uint32_t* device_id) const = 0; -#endif /** * \brief information about given Connection Key. |