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

Fix shared_ptr usage

Browse Source 
The std::shared_ptr type was used instead of std::tr1::shared_ptr. A NULL
pointer was also implicitly cast into a Backend pointer which caused
compilation problems on some platforms with the tr1 version of shared_ptr.
This commit is contained in:
Markus Mäkelä
2017-03-28 22:01:50 +03:00
parent 6e218adc1d
commit a3396a06b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/schemarouter/schemarouter.hh
View File

@ -35,7 +35,7 @@
using std::list; using std::list;
using std::set; using std::set;
using std::string; using std::string;
using std::shared_ptr; using std::tr1::shared_ptr;
using maxscale::Buffer; using maxscale::Buffer;

2
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -865,7 +865,7 @@ SBackend SchemaRouterSession::get_bref_from_dcb(DCB* dcb)
// This should not happen // This should not happen
ss_dassert(false); ss_dassert(false);
return SBackend(NULL); return SBackend(reinterpret_cast<Backend*>(NULL));
} }
/** /**