hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testlogthrottling compilation failure

Browse Source 
The ifstream constructor for some reason doesn't understand strings.
This commit is contained in:
Markus Mäkelä
2018-06-15 11:45:40 +03:00
parent 4cc4deeaf1
commit a983df5a7e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/test/testlogthrottling.cc
View File

@ -110,7 +110,7 @@ bool run(const MXS_LOG_THROTTLING& throttling, int priority, size_t n_generate,
mxs_log_set_throttling(&throttling); // Causes message to be logged. mxs_log_set_throttling(&throttling); // Causes message to be logged.
mxs_log_flush_sync(); mxs_log_flush_sync();
ifstream in(logfile); ifstream in(logfile.c_str());
in.seekg(0, ios_base::end); in.seekg(0, ios_base::end);
THREAD_ARG args[N_THREADS]; THREAD_ARG args[N_THREADS];
@ -171,7 +171,7 @@ int main(int argc, char* argv[])
char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX"; char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX";
char* logdir = mkdtemp(tmpbuf); char* logdir = mkdtemp(tmpbuf);
ensure(logdir); ensure(logdir);
logfile.assign(string{logdir} + '/' + LOGNAME); logfile.assign(string(logdir) + '/' + LOGNAME);
if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS)) if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS))
{ {