diff options
author | Kozoriz <kozorizandriy@gmail.com> | 2016-04-26 12:41:54 +0300 |
---|---|---|
committer | Kozoriz <kozorizandriy@gmail.com> | 2016-04-26 15:50:21 +0300 |
commit | 4ecdb2a83871784f34430ed09d5ef6a2c0855506 (patch) | |
tree | dc36b449e5d32ac3e493e16865cf9d88d9991817 /src/components/application_manager/src/message.cc | |
parent | cf58bb97d09c536dce3b492d1517da0b837bc8eb (diff) | |
download | sdl_core-4ecdb2a83871784f34430ed09d5ef6a2c0855506.tar.gz |
Format all code in project
Formated all code in appMain, components, plugins to correct coding-style
Used clang-format-3.6
Used 2 commands :
find src/appMain/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
find src/components/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
find src/plugins/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
Diffstat (limited to 'src/components/application_manager/src/message.cc')
-rw-r--r-- | src/components/application_manager/src/message.cc | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/components/application_manager/src/message.cc b/src/components/application_manager/src/message.cc index bb500687dd..a7c887d348 100644 --- a/src/components/application_manager/src/message.cc +++ b/src/components/application_manager/src/message.cc @@ -56,19 +56,17 @@ MessageType MessageTypeFromRpcType(protocol_handler::RpcType rpc_type) { } Message::Message(protocol_handler::MessagePriority priority) - : function_id_(0), - correlation_id_(0), - type_(kUnknownType), - priority_(priority), - connection_key_(0), - binary_data_(NULL), - data_size_(0), - payload_size_(0), - version_(kUnknownProtocol) { -} - -Message::Message(const Message& message) - : priority_(message.priority_) { + : function_id_(0) + , correlation_id_(0) + , type_(kUnknownType) + , priority_(priority) + , connection_key_(0) + , binary_data_(NULL) + , data_size_(0) + , payload_size_(0) + , version_(kUnknownProtocol) {} + +Message::Message(const Message& message) : priority_(message.priority_) { *this = message; } @@ -99,13 +97,13 @@ bool Message::operator==(const Message& message) { bool data_size = data_size_ == message.data_size_; bool payload_size = payload_size_ == message.payload_size_; - - bool binary_data = std::equal(binary_data_->begin(), binary_data_->end(), + bool binary_data = std::equal(binary_data_->begin(), + binary_data_->end(), message.binary_data_->begin(), BinaryDataPredicate); - return function_id && correlation_id && connection_key && type && binary_data - && json_message && version && data_size && payload_size; + return function_id && correlation_id && connection_key && type && + binary_data && json_message && version && data_size && payload_size; } Message::~Message() { @@ -191,7 +189,7 @@ void Message::set_protocol_version(ProtocolVersion version) { version_ = version; } -const smart_objects::SmartObject &Message::smart_object() const { +const smart_objects::SmartObject& Message::smart_object() const { return smart_object_; } |