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>
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)