commit 270233fc7c57486026f381cd8ba6a71b84d7be2d
author Rob Hughes <robert.hughes@arm.com> Wed Nov 13 11:53:48 2019 +0000
committer Rob Hughes <robert.hughes@arm.com> Thu Nov 14 10:47:03 2019 +0000
tree 6e75bee1a1d6042e104e8ea780cf524122c3f990
parent b5b3b35288578154525b38ea708ca564530f0c5d

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>

src/profiling/DirectoryCaptureCommandHandler.cpp

diff --git a/src/profiling/DirectoryCaptureCommandHandler.cpp b/src/profiling/DirectoryCaptureCommandHandler.cpp
index c5a2d97..65a7880 100644
--- a/src/profiling/DirectoryCaptureCommandHandler.cpp
+++ b/src/profiling/DirectoryCaptureCommandHandler.cpp
@@ -320,7 +320,7 @@
 std::string DirectoryCaptureCommandHandler::GetStringNameFromBuffer(const unsigned char* const data, uint32_t offset)
 {
     std::string deviceName;
-    u_char nextChar = profiling::ReadUint8(data, offset);
+    uint8_t nextChar = profiling::ReadUint8(data, offset);
 
     while (isprint(nextChar))
     {

src/profiling/test/FileOnlyProfilingDecoratorTests.cpp

diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
index 9bf177c..5524ed4 100644
--- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
+++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
@@ -35,7 +35,7 @@
     options.m_EnableProfiling     = true;
     options.m_FileOnly            = true;
     options.m_IncomingCaptureFile = "";
-    options.m_OutgoingCaptureFile = tempPath.c_str();
+    options.m_OutgoingCaptureFile = tempPath.string();
     options.m_CapturePeriod       = 100;
 
     // Enable the profiling service
@@ -45,9 +45,9 @@
     profilingService.Update();
     profilingService.Update();
 
-    u_int32_t timeout   = 2000;
-    u_int32_t sleepTime = 50;
-    u_int32_t timeSlept = 0;
+    uint32_t timeout   = 2000;
+    uint32_t sleepTime = 50;
+    uint32_t timeSlept = 0;
 
     // Give the profiling service sending thread time start executing and send the stream metadata.
     while (profilingService.GetCurrentState() != ProfilingState::WaitingForAck)

src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp

diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
index c393ec9..6a09281 100644
--- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
+++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
@@ -100,7 +100,7 @@
         boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
 
     armnn::Runtime::CreationOptions::ExternalProfilingOptions options;
-    options.m_IncomingCaptureFile = fileName.c_str();
+    options.m_IncomingCaptureFile = fileName.string();
     options.m_OutgoingCaptureFile =  "";
 
     ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, false);
@@ -149,7 +149,7 @@
 
     armnn::Runtime::CreationOptions::ExternalProfilingOptions options;
     options.m_IncomingCaptureFile = "";
-    options.m_OutgoingCaptureFile = fileName.c_str();
+    options.m_OutgoingCaptureFile = fileName.string();
 
     ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, false);