summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSho Amano <samano@xevo.com>2018-06-28 16:09:51 +0900
committerSho Amano <samano@xevo.com>2018-06-28 17:36:34 +0900
commitb09936e5c232765c873545bc34a48f58ac6e60e6 (patch)
tree60733d6e38ce03f8b35905b97f96f93aad461070
parentc42e8ccc4dd993a8f9b7ccf5fd5af1721e771517 (diff)
downloadsdl_core-b09936e5c232765c873545bc34a48f58ac6e60e6.tar.gz
Partially revert "Merge pull request #253 in NAR/sdl-core from feat/protocol_handler_unit_tests to feature/Ford-WiFi"
This reverts part of commit 4d0678fdb75fa7b8aa575d6adddf5cc9373951eb since the changes are not related to multiple-transports feature.
-rw-r--r--src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h b/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h
index 8a81b7a363..8f68003ada 100644
--- a/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h
+++ b/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h
@@ -33,7 +33,6 @@
#define SRC_COMPONENTS_PROTOCOL_HANDLER_TEST_INCLUDE_PROTOCOL_HANDLER_CONTROL_MESSAGE_MATCHER_H_
#include "gmock/gmock.h"
-#include <iomanip>
#include <ios>
#include <string>
#include <vector>
@@ -154,8 +153,7 @@ MATCHER_P4(ControlMessage,
*result_listener << "Message with " << data_vector.size()
<< " byte data : 0x";
for (size_t i = 0u; i < data_vector.size(); ++i) {
- *result_listener << std::setw(2) << std::setfill('0') << std::hex
- << static_cast<int>(data_vector[i]);
+ *result_listener << std::hex << static_cast<int>(data_vector[i]);
}
return false;
}