diff options
| author | fronneburg <fronneburg@xevo.com> | 2018-03-28 08:16:19 -0700 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-03-28 08:16:19 -0700 |
| commit | 9b7658d79d041428d502b3d99791263473c51b73 (patch) | |
| tree | 16e750cb1ab06e35a4eeb7a37d66fdf9fe33c9be /src/components/include/protocol_handler/session_observer.h | |
| parent | 78825ba8035661d0e1a60da3bddb750cbc7dfa56 (diff) | |
| download | sdl_core-9b7658d79d041428d502b3d99791263473c51b73.tar.gz | |
fix build problems from merges
Diffstat (limited to 'src/components/include/protocol_handler/session_observer.h')
| -rw-r--r-- | src/components/include/protocol_handler/session_observer.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/components/include/protocol_handler/session_observer.h b/src/components/include/protocol_handler/session_observer.h index 0491afb8f2..ad5f176a6c 100644 --- a/src/components/include/protocol_handler/session_observer.h +++ b/src/components/include/protocol_handler/session_observer.h @@ -66,8 +66,10 @@ struct SessionContext { protocol_handler::ServiceType service_type_; uint32_t hash_id_; bool is_protected_; +#ifdef ENABLE_SECURITY bool is_new_service_; bool is_ptu_required_; +#endif // ENABLE_SECURITY /** * @brief Constructor @@ -80,8 +82,11 @@ struct SessionContext { , service_type_(protocol_handler::kInvalidServiceType) , hash_id_(0) , is_protected_(false) +#ifdef ENABLE_SECURITY , is_new_service_(false) - , is_ptu_required_(false) {} + , is_ptu_required_(false) +#endif // ENABLE_SECURITY + {} /** * @brief Constructor @@ -111,8 +116,11 @@ struct SessionContext { , service_type_(service_type) , hash_id_(hash_id) , is_protected_(is_protected) +#ifdef ENABLE_SECURITY , is_new_service_(false) - , is_ptu_required_(false) {} + , is_ptu_required_(false) +#endif // ENABLE_SECURITY + {} }; /** @@ -236,6 +244,7 @@ class SessionObserver { transport_manager::ConnectionUID* connection_handle, uint8_t* sessionId) const = 0; +#if __SIZEOF_SIZE_T__ != 4 /** * DEPRECATED * \brief information about given Connection Key. @@ -249,6 +258,7 @@ 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. |