diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-05-11 12:20:11 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-05-11 12:20:11 +0200 |
| commit | 2e501c68a8641a2b3c430b55f13491a9c1c5d0f5 (patch) | |
| tree | 49c2748443fe3c1f01108756b647440e0647a11b /libxsde/xsde/cxx/serializer/non-validating/name.cxx | |
| parent | 161beba6cdb0d91b15ad19fa8b3e51d986203915 (diff) | |
Add support for custom allocators
New example: examples/cxx/hybrid/allocator.
Diffstat (limited to 'libxsde/xsde/cxx/serializer/non-validating/name.cxx')
| -rw-r--r-- | libxsde/xsde/cxx/serializer/non-validating/name.cxx | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libxsde/xsde/cxx/serializer/non-validating/name.cxx b/libxsde/xsde/cxx/serializer/non-validating/name.cxx index 851dcf9..6e8e0b1 100644 --- a/libxsde/xsde/cxx/serializer/non-validating/name.cxx +++ b/libxsde/xsde/cxx/serializer/non-validating/name.cxx @@ -5,6 +5,10 @@ #include <xsde/cxx/serializer/non-validating/name.hxx> +#ifdef XSDE_CUSTOM_ALLOCATOR +# include <xsde/cxx/allocator.hxx> +#endif + namespace xsde { namespace cxx @@ -16,8 +20,15 @@ namespace xsde name_simpl:: ~name_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 name_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; } } |