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 /src/profiling/test | |
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 'src/profiling/test')
-rw-r--r-- | src/profiling/test/FileOnlyProfilingDecoratorTests.cpp | 8 | ||||
-rw-r--r-- | src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp index 9bf177c096..5524ed4fbf 100644 --- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp +++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp @@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFileEndToEnd) 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 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFileEndToEnd) 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) diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp index c393ec9b07..6a092815b2 100644 --- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp +++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp @@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(DumpIncomingValidFile) 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 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingValidFile) 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); |