diff options
Diffstat (limited to 'libxsde/xsde/cxx/serializer/validating/base64-binary.cxx')
-rw-r--r-- | libxsde/xsde/cxx/serializer/validating/base64-binary.cxx | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/libxsde/xsde/cxx/serializer/validating/base64-binary.cxx b/libxsde/xsde/cxx/serializer/validating/base64-binary.cxx index e192be7..04b3ef0 100644 --- a/libxsde/xsde/cxx/serializer/validating/base64-binary.cxx +++ b/libxsde/xsde/cxx/serializer/validating/base64-binary.cxx @@ -5,6 +5,10 @@ #include <xsde/cxx/serializer/validating/base64-binary.hxx> +#ifdef XSDE_CUSTOM_ALLOCATOR +# include <xsde/cxx/allocator.hxx> +#endif + namespace xsde { namespace cxx @@ -16,8 +20,16 @@ namespace xsde base64_binary_simpl:: ~base64_binary_simpl () { - if (free_) - delete const_cast<buffer*> (value_); + if (free_ && value_) + { + buffer* v = const_cast<buffer*> (value_); +#ifndef XSDE_CUSTOM_ALLOCATOR + delete v; +#else + v->~buffer (); + cxx::free (v); +#endif + } } void base64_binary_simpl:: @@ -156,7 +168,13 @@ namespace xsde if (free_) { - delete const_cast<buffer*> (value_); + buffer* v = const_cast<buffer*> (value_); +#ifndef XSDE_CUSTOM_ALLOCATOR + delete v; +#else + v->~buffer (); + cxx::free (v); +#endif value_ = 0; } } |