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

Remove mxs::Closer<json_t*>

Browse Source 
As std::unique_ptr can now be used with a json_t, there's no need for the
closer.
This commit is contained in:
Markus Mäkelä
2018-08-19 07:30:34 +03:00
parent 0a0623003e
commit 02ed338afa
5 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/maxscale/jansson.hh
View File

@ -21,7 +21,6 @@
#include <maxbase/jansson.h>
#include <maxscale/alloc.h>
#include <maxscale/debug.h>
#include <maxscale/utils.hh>
namespace std
{
@ -40,28 +39,6 @@ struct default_delete<json_t>
namespace maxscale
{
/**
* @class CloserTraits<json_t*> jansson.hh <maxscale/jansson.hh>
*
* Specialization of @c CloserTraits for @c json_t*.
*/
template<>
struct CloserTraits<json_t*>
{
static void close_if(json_t* pJson)
{
if (pJson)
{
json_decref(pJson);
}
}
static void reset(json_t*& pJson)
{
pJson = NULL;
}
};
/**
* @brief Convenience function for dumping JSON into a string
*
@ -83,11 +60,6 @@ static inline std::string json_dump(const json_t* json, int flags = 0)
return rval;
}
static inline std::string json_dump(const Closer<json_t*>& json, int flags = 0)
{
return json_dump(json.get(), flags);
}
/**
* @brief Convert JSON to string
*

5
include/maxscale/utils.hh
View File

@ -154,7 +154,10 @@ struct CloserTraits
*
* @param t Close the resource *if* it has not been closed already.
*/
static void close_if(T t);
static void close_if(T t)
{
static_assert(sizeof(T) != sizeof(T), "The base closer should never be used");
}
/**
* Resets a reference to a resource. After the call, the value of t should