Fix issues revealed on CentOS6

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

View File

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

View File

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

View File

@ -12,6 +12,7 @@
*/
#include "maxscale/module.hh"
#include <string>
#include "../../../core/internal/modules.h"
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)
{
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)