diff options
author | Rob Hughes <robert.hughes@arm.com> | 2019-11-13 11:53:48 +0000 |
---|---|---|
committer | Rob Hughes <robert.hughes@arm.com> | 2019-11-14 10:47:03 +0000 |
commit | 270233fc7c57486026f381cd8ba6a71b84d7be2d (patch) | |
tree | 6e75bee1a1d6042e104e8ea780cf524122c3f990 /tests/profiling/gatordmock/GatordMockService.hpp | |
parent | b5b3b35288578154525b38ea708ca564530f0c5d (diff) | |
download | armnn-270233fc7c57486026f381cd8ba6a71b84d7be2d.tar.gz |
Fix a few compile errors:
* Replace use of non-standard integral types (e.g. u_char)
* Convert boost::filesystem::paths to std::strings using the .string()
method rather than .c_str(), because on Windows .c_str() returns a wide
character string, which is not convertible to a std::string.
Change-Id: Ia86b0653697033bb1afa01e64b5b2103dd042ffd
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'tests/profiling/gatordmock/GatordMockService.hpp')
-rw-r--r-- | tests/profiling/gatordmock/GatordMockService.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/profiling/gatordmock/GatordMockService.hpp b/tests/profiling/gatordmock/GatordMockService.hpp index deafcfdc92..a77d7ff480 100644 --- a/tests/profiling/gatordmock/GatordMockService.hpp +++ b/tests/profiling/gatordmock/GatordMockService.hpp @@ -90,7 +90,7 @@ public: void SendPeriodicCounterSelectionList(uint32_t period, std::vector<uint16_t> counters); /// Execute the WAIT command from the comamnd file. - void WaitCommand(uint timeout); + void WaitCommand(uint32_t timeout); uint32_t GetStreamMetadataVersion() { @@ -117,17 +117,17 @@ private: armnn::profiling::Packet ReceivePacket(); - bool SendPacket(uint32_t packetFamily, uint32_t packetId, const u_char* data, uint32_t dataLength); + bool SendPacket(uint32_t packetFamily, uint32_t packetId, const uint8_t* data, uint32_t dataLength); - void EchoPacket(PacketDirection direction, u_char* packet, size_t lengthInBytes); + void EchoPacket(PacketDirection direction, uint8_t* packet, size_t lengthInBytes); bool ReadHeader(uint32_t headerAsWords[2]); - bool ReadFromSocket(u_char* packetData, uint32_t expectedLength); + bool ReadFromSocket(uint8_t* packetData, uint32_t expectedLength); - uint32_t ToUint32(u_char* data, TargetEndianness endianness); + uint32_t ToUint32(uint8_t* data, TargetEndianness endianness); - void InsertU32(uint32_t value, u_char* data, TargetEndianness endianness); + void InsertU32(uint32_t value, uint8_t* data, TargetEndianness endianness); static const uint32_t PIPE_MAGIC = 0x45495434; |