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

Fix issues revealed on CentOS6

Browse Source
This commit is contained in:
Johan Wikman
2017-12-01 16:25:46 +02:00
parent 574af7762d
commit cf627203cb
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/filter/test/maxscale/filtermodule.hh
View File

@ -187,10 +187,11 @@ private:
} }
private: private:
friend Base; // Not accepted by CentOS6: friend Base;
friend class SpecificModule<FilterModule, MXS_FILTER_OBJECT>;
FilterModule(const MXS_MODULE* pModule) FilterModule(const MXS_MODULE* pModule)
: Base(pModule) : SpecificModule<FilterModule, MXS_FILTER_OBJECT>(pModule)
{ {
} }
}; };

1
server/modules/filter/test/mock_backend.cc
View File

@ -13,6 +13,7 @@
#include "maxscale/mock/backend.hh" #include "maxscale/mock/backend.hh"
#include <algorithm> #include <algorithm>
#include <vector>
#include <maxscale/query_classifier.h> #include <maxscale/query_classifier.h>
#include <maxscale/protocol/mysql.h> #include <maxscale/protocol/mysql.h>
#include <iostream> #include <iostream>

3
server/modules/filter/test/module.cc
View File

@ -12,6 +12,7 @@
*/ */
#include "maxscale/module.hh" #include "maxscale/module.hh"
#include <string>
#include "../../../core/internal/modules.h" #include "../../../core/internal/modules.h"
using std::auto_ptr; using std::auto_ptr;
@ -78,7 +79,7 @@ const char* Module::ConfigParameters::get(const char* zName) const
void Module::ConfigParameters::set_value(const char* zName, const char* zValue) void Module::ConfigParameters::set_value(const char* zName, const char* zValue)
{ {
return set_value(zName, std::string(zValue)); set_value(zName, std::string(zValue));
} }
void Module::ConfigParameters::set_value(const char* zName, const std::string& value) void Module::ConfigParameters::set_value(const char* zName, const std::string& value)