diff options
Diffstat (limited to 'libxsde/xsde/cxx/serializer/non-validating/id.cxx')
| -rw-r--r-- | libxsde/xsde/cxx/serializer/non-validating/id.cxx | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libxsde/xsde/cxx/serializer/non-validating/id.cxx b/libxsde/xsde/cxx/serializer/non-validating/id.cxx index db50bef..ac7ede2 100644 --- a/libxsde/xsde/cxx/serializer/non-validating/id.cxx +++ b/libxsde/xsde/cxx/serializer/non-validating/id.cxx @@ -5,6 +5,10 @@ #include <xsde/cxx/serializer/non-validating/id.hxx> +#ifdef XSDE_CUSTOM_ALLOCATOR +# include <xsde/cxx/allocator.hxx> +#endif + namespace xsde { namespace cxx @@ -16,8 +20,15 @@ namespace xsde id_simpl:: ~id_simpl () { - if (free_) - delete[] const_cast<char*> (value_); + if (free_ && value_) + { + char* v = const_cast<char*> (value_); +#ifndef XSDE_CUSTOM_ALLOCATOR + delete[] v; +#else + cxx::free (v); +#endif + } } void id_simpl:: @@ -33,7 +44,12 @@ namespace xsde if (free_) { - delete[] const_cast<char*> (value_); + char* v = const_cast<char*> (value_); +#ifndef XSDE_CUSTOM_ALLOCATOR + delete[] v; +#else + cxx::free (v); +#endif value_ = 0; } } |